Fix the script issue in the CLB test suite
Merge from Perforce
Merge branch 'bug/b533'