Merge "PROD-36050 Remove typo from heat template"