Fix heat stack macro to handle multiple stack-templates