(PUP-3277) Ensure agents re-enabled after disable agent test
And a step in the agent_disable_lockfile step to ensure that agents are
re-enabled. This should insulate subsequent tests from a failure partway
through agenet_disable_lockfile leaving disabled agents in its wake.