Merge "Changes in DiscoveryService to cope with recently introduced HA active-active...