2015-08-07 - releng
17:52	<bd808>	Removed stale cherry-pick of Ib10deb5b4e42d440c5deff0897e714174f3e38fe that was breaking puppet rebase	[releng]