2020-07-17 - releng
00:18	<dpifke>	Cherry picking https://gerrit.wikimedia.org/r/c/operations/puppet/+/613359 into beta puppet.	[releng]