[master] Merge branch 'trac3981'

Conflicts:
	src/bin/dhcp4/tests/Makefile.am

diff --cc src/bin/dhcp4/dhcp4_messages.mes
Simple merge

diff --cc src/bin/dhcp4/dhcp4_srv.cc
Simple merge

diff --cc src/bin/dhcp4/tests/Makefile.am
index 5648da73fd8bfc9794086a9418b25944ecdc6f09,83966fe06bb1226072b05a88e77ee5d6c0a3ff54..721cad3a7889f22b1ef25f4b343ac08b23cbc758
--- 1/src/bin/dhcp4/tests/Makefile.am
--- 2/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -88,8 -86,8 +88,8 @@@ dhcp4_unittests_SOURCES += dhcp4_client
  dhcp4_unittests_SOURCES += inform_unittest.cc
  dhcp4_unittests_SOURCES += dora_unittest.cc
  dhcp4_unittests_SOURCES += release_unittest.cc
- 
 +dhcp4_unittests_SOURCES += out_of_range_unittest.cc
 -
+ dhcp4_unittests_SOURCES += decline_unittest.cc
  dhcp4_unittests_SOURCES += kea_controller_unittest.cc
  
  nodist_dhcp4_unittests_SOURCES = marker_file.h test_libraries.h

diff --cc src/bin/dhcp4/tests/dhcp4_client.cc
Simple merge