Decouple discovery service names from sandesh module and service
names. Move back to using 'Collector', 'ApiServer', 'OpServer' as
discovery service names.
Closes-Bug: #1389359

Change-Id: I17e3a1b02191d45c9110e616f06a17d7a5b4dca0