Special case for ServiceDiscovery

getServiceWithTypeAndId needs to return the ServiceDiscovery, which is a
special case since it has no service id.

Jira-issue: WP-699
Merge pull request #5 from aldafu/WP-699-registry-disco-special-case

Special case for ServiceDiscovery