OOIION-1741: Remove ElasticSearch support from system

- Polish discovery
- Add discovery service tests