2021-09-15 - releng
22:59	<dpifke>	Un-cherry-picked https://gerrit.wikimedia.org/r/c/operations/puppet/+/721047 in deployment-prep for now; more work needed.	[releng]