minor change to maintain consistent docs #4632
New trimmed world order where initial config given #4605
Test fixes to go with trimmed new config way #4605
Merge branch 'V8_2-branch'

Conflicts:
	nmi_tools/glue/test/remote_pre
	src/condor_scripts/CondorPersonal.pm