Merge "Add latest heat templates for vFW and vLB"