Common Script fixes

Daniel Scholl (MS]requested to merge
validation into master

This fixes a few bugs and issues with the common setup script.

Merge request reports