Merge "Error in string format in HeatTemplateError message"