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

Fixes: rhbz#1084216

Change-Id: I075842a33cceada8690d318459aec1c8b483e54e
Merge "[heat] updated the templates according to latest stable/havana"