[2892] Merge branch 'trac2892'

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

diff --cc src/bin/dhcp6/dhcp6_srv.cc
Simple merge

diff --cc src/bin/dhcp6/dhcp6_srv.h
Simple merge

diff --cc src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
Simple merge

diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.h
index 82ff9847b8a1c624d15db8645d06d87b9b2e1372,52d65829253ac23fe2a3fbfda116256c8d223806..17cd9e8cc713c03a29a4dfba13983a5a6b901d54
--- 1/src/bin/dhcp6/tests/dhcp6_test_utils.h
--- 2/src/bin/dhcp6/tests/dhcp6_test_utils.h
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.h
@@@ -111,8 -111,8 +111,9 @@@ public
      using Dhcpv6Srv::createRemovalNameChangeRequest;
      using Dhcpv6Srv::createStatusCode;
      using Dhcpv6Srv::selectSubnet;
+     using Dhcpv6Srv::testServerID;
      using Dhcpv6Srv::sanityCheck;
 +    using Dhcpv6Srv::classifyPacket;
      using Dhcpv6Srv::loadServerID;
      using Dhcpv6Srv::writeServerID;
      using Dhcpv6Srv::unpackOptions;