Fixes for the tool shed's install and test framework.
merged from next-stable