HCOLL-134 refactored and renamed to NodeDiscovery