Support colon in service name.

There are also issues with a slash, I think on the discoverd side of things, but this will allow colons as separators.