2020-08-06 - releng
23:46	<dpifke>	Cherry-picking https://gerrit.wikimedia.org/r/c/operations/puppet/+/601429 in beta.	[releng]