2015-07-08 - releng
22:48	<marxarelli>	cherry-picked https://gerrit.wikimedia.org/r/#/c/223691/ on integration-puppetmaster	[releng]