HM Minor cleanup
Merge branch 'master' of https://github.com/open-infinity/cmt

Conflicts:
	cloud/cloud-worker/puppet/puppet_nodes.pl