2017-10-20 - releng
10:00	<elukey>	cherry pick https://gerrit.wikimedia.org/r/#/c/385339 to the operations/puppet git repo on puppetmaster02	[releng]