2014-10-07 - releng
09:34	<Krinkle>	Rebase integration-puppetmaster on latest operations-puppet (patches: I7163fd38bcd082a1, If2e96bfa9a1c46)	[releng]