Remove unused class DiscoveryFutures
Guarantee services are refreshed in returned future
Add discovery ServiceSelectorManager