2021-05-15 - releng
06:23	<Majavah>	cherry pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/691494/ T281986	[releng]