2017-03-08 - releng
22:45	<Reedy>	https://gerrit.wikimedia.org/r/#/c/341916/ cherry picked onto deployment-puppetmaster02	[releng]