2021-03-07 - releng
16:51	<Majavah>	cherry pick 669436 and 669436 to deployment-puppetmaster04 T276707	[releng]