[FABRIC-877] ServiceLocator leaks ServiceListener