Merge "Update to work with new heat templates"