2014-12-19 - releng
05:33	<Krinkle>	Rebasing integration-puppetmaster with latest operations/puppet upstream (5 patches)	[releng]