2018-04-05 - releng
17:50	<eddiegp>	Cherry-picking https://gerrit.wikimedia.org/r/c/424361/ on deployment-puppetmaster02 to try unbreak T173887	[releng]