Keep batch file for windows include test from line echo #4322
(#4540)  Fix a crash in the EC2 GAHP if $ENV{USER} isn't set.