Merge from Perforce
Merge from Perforce
Modify the script issue in the Band Balancing test suite
Modify the script issue in the Bonjour Gateway test suite