Conflicts: src/bin/dhcp6/dhcp6_srv.cc src/lib/dhcpsrv/lease.cc src/lib/dhcpsrv/tests/lease_unittest.cc