Wp 1024 missing servicedisco commits

When the ServiceDisocvery API was merged the changes in this PR have been missing. The PR corrects that.

Jira-issue: WP-1024