fix router discovering brokers with default names

The curator specific name should only be necessary within the CuratorServiceAnnouncer, or when dealing with curator classes such as ServiceProvider.

The TieredBrokerHostSelector should use the actual name (as opposed to curator name) to get the serviceDiscoverySelector.

Without this PR the router cannot discover brokers with the default settings (druid/broker).