minor 8.2.5 version history item edit #4728
minor 8.2.5 version history item edit #4720
minor 8.2.5 version history item edit #4697
Improve restoration of condor_config.local #4731
Merge branch 'V8_2-branch' of /p/condor/repository/CONDOR_SRC into V8_2-branch