Improve restoration of condor_config.local #4731
Merge branch 'V8_2-branch' of /p/condor/repository/CONDOR_SRC into V8_2-branch
add defn of machine attribute TotalSlots to manual #4623
Remove fluff from Unified RPM #4731
add/improve defns for attributes Disk, TotalDisk, and TotalSlotDisk
 #4623
 add/improve defns for attributes Cpus, TotalCpus, and TotalSlotCpus
 #4623
add/improve defns for attributes Memory, TotalMemory, and
TotalSlotMemory #4623
Merge branch 'V8_2-branch' of /p/condor/repository/CONDOR_SRC into V8_2-branch
Merge branch 'V8_2-branch' into V8_3_2-branch
Merge branch 'V8_3_2-branch'