2021-05-07 - toolsbeta
14:20	<Majavah>	cherry pick https://gerrit.wikimedia.org/r/c/operations/puppet/+/686607/	[toolsbeta]