[rfc7550] Merge branch 'trac3947' into rfc7550

diff --cc src/bin/dhcp6/dhcp6_srv.cc
index 3e3ac334d72f2311f21e40b31f9fcaa909054314,da58f13d47e3693af5cff33e4073cf8ee1099305..f54af4810a26cf63340743c6ff0711fb6a3ff5d1
--- 1/src/bin/dhcp6/dhcp6_srv.cc
--- 2/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@@ -479,10 -479,10 +479,10 @@@ bool Dhcpv6Srv::run() 
              continue;
          }
  
 -        LOG_DEBUG(packet_logger, DBG_DHCP6_BASIC_DATA, DHCP6_PACKET_RECEIVED)
 +        LOG_DEBUG(packet6_logger, DBG_DHCP6_BASIC_DATA, DHCP6_PACKET_RECEIVED)
              .arg(query->getLabel())
              .arg(query->getName())
-             .arg(query->getType())
+             .arg(static_cast<int>(query->getType()))
              .arg(query->getRemoteAddr())
              .arg(query->getLocalAddr())
              .arg(query->getIface());