PR 6556 opened against ci-job-configs to try and do this for puppet agent.
Merged into the master branch of ci-job-configs at https://github.com/puppetlabs/ci-job-configs/commit/a0f9eca968653fcb45ed470116ab02077a6f11bf
I want to keep this open for a day or two to make sure we get a good run of puppet and friends
I'm going to go ahead and resolve this. CI looks stable and this has been in for a week now.