Add use of displayName to distinguish services.

Also change semantics of contains() method to be more intuitive.

Jira issue: wp-1253
Changed to use id to distinguish services

Jira issue: wp-1253
Merge pull request #33 from TobyEalden/service-disco-fix

Add use of displayName to distinguish services.