Partial rework of regression scripts for branch independent testing.

[SVN r39974]
Partial rework of regression scripts for branch independent testing.

[SVN r39975]