2017-06-16 - releng
02:23	<Reedy>	cherry-picked https://gerrit.wikimedia.org/r/#/c/354932/ onto beta puppetmaster	[releng]