fixes for LLServiceDiscoveryManager. About to try refactoring LLServiceDiscoveryManager to remove it managing its own set of features. ServiceDiscoveryManager handles that fine
LLServiceDiscoveryManager yields to ServiceDiscoveryManager for reduced code duplication