2015-12-08 - releng
20:31	<hashar>	beta: rebased operations/puppet and locally fixed a conflict	[releng]