Merge "[VVP] update heat templates for vFW"