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