Fix bug with PREEMPTION_REQUIREMENTS and surplus sharing #4093
Merge branch 'V8_0-branch' of /p/condor/repository/CONDOR_SRC into V8_0-branch