Merge from Perforce
Merge branch 'master' of github.com:Everett6802/scg_columbus_25
Add the test cases of setting syslog server
Merge from Perforce
Solve the conflict