Puppet refactoring
[scripts]
[ha changes]
Merge branch 'puppet_cleanup_ha' of https://github.com/thilakrajs/contrail-puppet into thilakrajs-puppet_cleanup_ha

Conflicts:
	files/cfg-qpidd-rabbitmq.sh
	files/setup_rabbitmq_cluster.sh
	manifests/compute.pp
	manifests/config.pp
	templates/ctrl-details.erb
Merge branch 'thilakrajs-puppet_cleanup_ha' into puppet_cleanup