2016-11-12 - releng
14:02	<Amir1>	cherry-picked gerrit change 321096/2 in puppetmaster	[releng]