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