Merge from Perforce
Fix the script issue in the CLB test suite