HCOLL-134 more work on node discovery