2016-07-26 - releng
12:49	<godog>	cherry-pick https://gerrit.wikimedia.org/r/#/c/300827/ on deployment-puppetmaster	[releng]