[master] Merge branch 'trac2981'

diff --cc configure.ac
Simple merge

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

diff --cc src/bin/dhcp6/dhcp6_messages.mes
Simple merge

diff --cc src/bin/dhcp6/tests/Makefile.am
index 293173c49da109a39ce09020232bf99f5a219388,a08d9d122be54d030c0840c0eab2d4e3c3af06d0..928598ec4a50f76cc0edc5b4d4cd8c6e1de53b76
--- 1/src/bin/dhcp6/tests/Makefile.am
--- 2/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@@ -44,15 -45,23 +45,25 @@@ TESTS_ENVIRONMENT = 
  
  TESTS =
  if HAVE_GTEST
+ # Build shared libraries for testing.
+ lib_LTLIBRARIES = libco1.la libco2.la
  
- TESTS += dhcp6_unittests
+ libco1_la_SOURCES  = callout_library_1.cc callout_library_common.h
+ libco1_la_CXXFLAGS = $(AM_CXXFLAGS)
+ libco1_la_CPPFLAGS = $(AM_CPPFLAGS)
+ 
+ libco2_la_SOURCES  = callout_library_2.cc callout_library_common.h
+ libco2_la_CXXFLAGS = $(AM_CXXFLAGS)
+ libco2_la_CPPFLAGS = $(AM_CPPFLAGS)
  
+ TESTS += dhcp6_unittests
  dhcp6_unittests_SOURCES  = dhcp6_unittests.cc
  dhcp6_unittests_SOURCES += dhcp6_srv_unittest.cc
 +dhcp6_unittests_SOURCES += hooks_unittest.cc
 +dhcp6_unittests_SOURCES += dhcp6_test_utils.h
  dhcp6_unittests_SOURCES += ctrl_dhcp6_srv_unittest.cc
  dhcp6_unittests_SOURCES += config_parser_unittest.cc
+ dhcp6_unittests_SOURCES += marker_file.cc
  dhcp6_unittests_SOURCES += ../dhcp6_srv.h ../dhcp6_srv.cc
  dhcp6_unittests_SOURCES += ../dhcp6_log.h ../dhcp6_log.cc
  dhcp6_unittests_SOURCES += ../ctrl_dhcp6_srv.cc