2021-03-30 - releng
13:55	<Majavah>	cherry pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/675802/ on beta to unblock my progress until merged	[releng]