Fix some messed up indenting. Tabs are 4 spaces in HTCondor, folks.
Added knob NEGOTIATOR_TRIM_SHUTDOWN_THRESHOLD. #4266
Fixed documentation on how to create a pslot with all CPUs included.
Merge branch 'V8_0-branch' into V8_1_5-branch

Conflicts (hopefully resolved correctly!):
	src/condor_utils/param_info.in
Merge branch 'V8_1_5-branch'