Fix tool shed install and test framework to work with API driven tests.
Merge latest stable.