Fix #591: URI is not hierarchical when loading tools in separate project.
Merge pull request #592 from sjrd/fix-corelib-uri-error

Fix #591: URI is not hierarchical when loading tools in separate project