2015-08-28 - releng
20:15	<bd808>	restored 3 cherry picks that were lost when rebuilding the ops/puppet git repo	[releng]