Merge from Perforce
Fix the script issues in the config ap zone test suite