2015-07-29 - releng
14:38	<bblack>	cherry-picked https://gerrit.wikimedia.org/r/#/c/215624 (updated to PS8) into deployment-puppetmaster ops/puppet	[releng]