Merge from Perforce
Fix the script issue in the AP Pre-Provision test suite