r21494: Fix 'make wintest' to support command-line changes to 'vm-get-ip.pl' and...