Pop BUILDBOT_CONFIG so it doesn't leak to subprocesses or logs.
Misc cleanup.
60s test