2017-01-19 - releng
16:56	<hashar>	rebased puppet master on integration and deployment-prep Trivial conflict between https://gerrit.wikimedia.org/r/#/c/312523/ and a lint change	[releng]