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