2017-05-10 - releng
14:34	<elukey>	cherry pick gerrit/352582 to puppet master	[releng]