(#1548)  Rewrite patch for less failure.
Merge branch 'master' of ssh://ingwe.cs.wisc.edu/p/condor/repository/CONDOR_SRC
Merge branch 'master' of ssh://ingwe.cs.wisc.edu/p/condor/repository/CONDOR_SRC