2016-11-14 - releng
08:16	<Amir1>	cherry-picking 321096/3 in beta puppetmaster	[releng]