2016-04-08 - releng
08:42	<hashar>	Rebased puppet master and fixed conflict with https://gerrit.wikimedia.org/r/#/c/249490/	[releng]