Addressing various buildbot errors related to instrument agents.