2021-03-06 - releng
09:48	<Majavah>	cherry-pick https://gerrit.wikimedia.org/r/668995 on deployment-puppetmaster04 T276654	[releng]