2018-03-12 - releng
19:54	<bd808>	Cherry picked https://gerrit.wikimedia.org/r/#/c/418986/ to deployment-puppetmaster02	[releng]