Gittrac #4710:  Committing the fix after review by eje.
Merge branch 'V8_2-branch' of /p/condor/repository/CONDOR_SRC into V8_2-branch