Merge "Enable Heat for openstack templates"