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