Merge "Enable Heat for docker templates"