Merge from Perforce
Fix the script issue in the syslog enhancement test suite