Fix for NMS-6909: NonUniqueResultException BridgeDiscovery