2016-10-04 - releng
16:19	<bd808>	deployment-puppetmaster: removing cherry-pick of https://gerrit.wikimedia.org/r/#/c/305256/; conflicts with upstream changes	[releng]