Fix the script issue in the config ap zone test suite
Merge from Perforce
Merge branch 'bug/b30'