2018-09-11 - releng
21:39	<marxarelli>	cherry-pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/459850 on integration-puppetmaster01	[releng]