edits for new COLLECTOR_PORT knob #4432
Merge branch 'V8_3_1-branch' of /p/condor/repository/CONDOR_SRC into V8_3_1-branch