(#3627)  VMWare Workstation/Player discrimination should now work on Windows, as well.  Also fixes bug trying to use VMWare Server.
Merge branch 'master' of ssh://ingwe.cs.wisc.edu/p/condor/repository/CONDOR_SRC