Conflicts: src/lib/dhcp/iface_mgr.cc src/lib/dhcp/iface_mgr.h src/lib/dhcp/tests/iface_mgr_unittest.cc