2019-06-28 - releng
08:58	<godog>	cherry pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/519603	[releng]