edit 8.0.4 version history item #3921
Merge branch 'V8_0-branch' of /p/condor/repository/CONDOR_SRC into V8_0-branch
Merge branch 'V8_0-branch' into V8_1_2-branch