2015-06-02 - releng
20:38	<marxarelli>	manually rebased operations/puppet on integration-puppetmaster to fix empty commit from cherry-pick	[releng]