Fixes from code review #2946
Merge branch 'master' of /p/condor/repository/CONDOR_SRC