Merge default to next-stable, open next-stable in preparation for release.
Use the same path for tool shed repositories when testing both tool dependencies and repositories with tools in the same test run.
Merge bugfix from next-stable.