2016-12-15 - releng
19:23	<marxarelli>	Manually rebasing and re-applying cherry picks for operations/puppet on integration-puppetmaster01.eqiad.wmflabs	[releng]