[992] Merge branch 'master' into trac992
Conflicts: ChangeLog src/bin/dhcp6/dhcp6_srv.cc src/lib/dhcp/iface_mgr.cc src/lib/dhcp/pkt4.h src/lib/dhcp/tests/iface_mgr_unittest.cc src/lib/dhcp/tests/pkt4_unittest.cc
This diff is collapsed.
Conflicts: ChangeLog src/bin/dhcp6/dhcp6_srv.cc src/lib/dhcp/iface_mgr.cc src/lib/dhcp/pkt4.h src/lib/dhcp/tests/iface_mgr_unittest.cc src/lib/dhcp/tests/pkt4_unittest.cc