2017-06-13 - releng
16:04	<Amir1>	cherry-picked 357985/4 on puppetmaster	[releng]