2019-06-07 - releng
13:30	<godog>	cherry pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/515058	[releng]