Change the condor superuser to the commonly used user gfactory
Remove redundant config file
Merge remote-tracking branch 'origin/v3/7028' into branch_v3_2