2017-05-10 - releng
15:26	<elukey>	refresh cherry pick gerrit/352582 on puppet master (rebase -i to remove, then cherry pick)	[releng]