Merge "NSB: update vfw tc_heat_external tests"