Refactor ServiceDiscovery construction

Change service type URL to internal syntax. On client use proper info
object with internal API URL when calling ServiceDiscovery constructor.

Jira-issue: http://jira.webinos.org/browse/WP-1044