[heat] updated the templates according to latest stable/havana

Fixes: rhbz#1084216

Conflicts:
	packstack/puppet/templates/heat.pp
	packstack/puppet/templates/heat_cfn.pp
	packstack/puppet/templates/heat_cloudwatch.pp
	packstack/puppet/templates/heat_qpid.pp
	packstack/puppet/templates/heat_rabbitmq.pp

Change-Id: I075842a33cceada8690d318459aec1c8b483e54e
(cherry picked from commit a8d00288929de4d1d8a5cc4aa3fff483337f81a0)
Merge "[heat] updated the templates according to latest stable/havana" into havana