Fix the script issues in the soft GRE test cases
Merge from Perforce
Merge branch 'bug/b335'