Merge "Refactor to IpNeighborMonitor and single-threaded semantics"