Merge "[dovetail] Querying correct control node IPs"