2016-08-26 - releng
07:54	<Amir1>	cherry-picked 306839/1 into deployment-puppetmaster	[releng]