Code cleanup and minor fixes in prep scripts for tool shed nightly test runs and its functional test framework.