2021-07-13 - releng
16:33	<dpifke>	Cherry-picking https://gerrit.wikimedia.org/r/c/operations/puppet/+/703912 in deployment-prep puppet. Should only affect deployment-webperf12.	[releng]