2016-09-07 - releng
05:25	<legoktm>	cherry-picked https://gerrit.wikimedia.org/r/#/c/308918/ onto integration-puppetmaster with a hack that has it only apply to integration-slave-jessie-1005	[releng]