take discovery out of all rest resources except the resolver ones. Then, add a method to the discovery source manager to allow management of sources allowed in a workspace, especially for compound uris (the imply a set of other uris). Finally, fix a couple of minor bugs like NPEs