2020-02-24 - releng
15:23	<godog>	cherry-pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/574485	[releng]