Merge pull request #4233 from mmascher/master

Use multiple collectors
Fix random usage.
Update htcondor_make_runtime.sh
Fix renewal of remote proxies in case of voms role not being set.
Protect against a broken cmscp python2.6 environment.
Move around logfiles.
Bugfixes from testing postjob.
Fix memory usage of condor_q.
Minor bugfixes from large task tests.
Make sure we don't inject into ASO if we're not supposed to save logs.
Found an appropriate parameter for disabling condor_q locking.
First set of fine-tuning of ASO failure reasons.
Match timeout to Stefano's proposal.
Have the sleep time be a function of when the post-job ended, not when the pre-job started.
Switch to a JSON-based format for the site ad to reduce prejob usage.
Fix minor bug in adjustable timeout.
Minor bugfix of JSON use.
New pre-release.
Avoid unnecessary relabeling of killed state