2020-06-02 - releng
21:11	<Reedy>	cherry picked https://gerrit.wikimedia.org/r/#/c/operations/puppet/+/601808/ onto deployment-puppetmaster04 T254185	[releng]