2018-01-03 - releng
19:07	<hashar>	deployment-prep: restored all the cherry picks on the puppet master	[releng]