2024-12-04 - releng
20:41	<MatmaRex>	Cherry-picked https://gerrit.wikimedia.org/r/c/operations/puppet/+/1100531	[releng]