2015-09-10 - releng
22:28	<Krenair>	cherry-picked https://gerrit.wikimedia.org/r/#/c/237523/ on deployment-puppetmaster	[releng]