Merge from Perforce
Merge branch 'master' of github.com:Everett6802/scg_columbus_25
Merge form Perforce
Fix the script issues in the FTP test suite