2021-03-29 - releng
06:46	<Majavah>	cherry-pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/675357/ on deployment-puppetmaster04 - T278664	[releng]