Get job_mem_checker testing on windows #3784
Allow for netstat with a grep for condor to fail #3836
Merge branch 'master' of /p/condor/repository/CONDOR_SRC