Merge branch 'V8_1_2-branch'
Merge branch 'master' of ingwe:/p/condor/repository/CONDOR_SRC