Merge from Perforce
Fix the script issue in the config ap zone test cases
Migrate codes from the 2.5 branch