2017-05-05 - releng
08:30	<godog>	cherry-pick https://gerrit.wikimedia.org/r/#/c/350220/ on deployment-puppetmaster02	[releng]