Merge branch 'master' into icehouse-support

Conflicts:
	CHANGELOG.md
	manifests/loadbalancer.pp
	spec/classes/cloud_compute_hypervisor_spec.rb