Merge "Update to support using external heat template"