Fix EZP-21669: Refactor and fix DiscoveryService class
Fix EZP-21669: Refactor and fix DiscoveryService class
Fix EZP-21669: Refactor and fix DiscoveryService class
Unit tests CS fix