Merge remote-tracking branch 'origin/branch_master_3555'

Conflicts:
	creation/lib/cgWParamDict.py
	creation/web_base/condor_startup.sh
	creation/web_base/glidein_startup.sh
	doc/factory/configuration.html
Merge branch 'master' into master_2905

Conflicts:
	creation/lib/cgWParamDict.py
	doc/factory/configuration.html