[master] Merge branch 'trac3807'

diff --cc doc/guide/logging.xml
Simple merge

diff --cc src/bin/dhcp4/dhcp4_messages.mes
index eca75be40d22f7e88194eee98229e3c6e17d523f,c3942d1416ec94028830002df7ec83f4b959a97e..1c5b36961ecb68b1ecc5603e32cdafc3026d6abb
--- 1/src/bin/dhcp4/dhcp4_messages.mes
--- 2/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@@ -501,28 -493,32 +507,29 @@@ intervention (e.g. check if DHCP proces
  update the database). It may also be triggered if a lease was manually
  removed from the database during RELEASE message processing. The
  first argument includes the client and the transaction identification
- information. The second argument holds the IP address which release
+ information. The second argument holds the IPv4 address which release
  was attempted.
  
 +% DHCP4_RELEASE_FAIL_NO_SUBNET %1: client is trying to release a lease %2 from a subnet which cannot be selected.
 +This warning message indicates that client tried to release an address
 +from an improper location.  The first argument contains the client and
 +transaction identification information. The second argument contains
 +the address which the client is trying to release.
 +
  % DHCP4_RELEASE_FAIL_NO_LEASE %1: client is trying to release non-existing lease %2
  This debug message is printed when client attempts to release a lease,
  but no such lease is known to the server. The first argument contains
  the client and transaction identification information. The second
- argument contains the address which the client is trying to release.
+ argument contains the IPv4 address which the client is trying to
+ release.
  
 -% DHCP4_RELEASE_FAIL_WRONG_CLIENT_ID %1: client tried to release address %2, but this address is leased to different client using client id %3
 -This warning message indicates that client tried to release an address
 -that belongs to a different client. This should not happen in normal
 -circumstances and may indicate a misconfiguration of the client.  However,
 -since the client releasing the address will stop using it anyway, there
 -is a good chance that the situation will correct itself.
 -
 -% DHCP4_RELEASE_FAIL_WRONG_HWADDR %1: client tried to release address %2, but this address is leased to different client using HW address %3
 -This warning message indicates that client tried to release an address
 -that does belong to it, but the lease information was associated with
 -a different hardware address. One possible reason for using different
 -hardware address is that a cloned virtual machine was not updated and
 -both clones use the same client-id. The first argument includes the
 -client and the transaction identification information. The second
 -argument includes the IPv4 address which release was attempted. The
 -third argumnet includes the HW address of the lease owner.
 +% DHCP4_RELEASE_FAIL_WRONG_CLIENT %1: client is trying to release the lease %2 which belongs to a different client
 +This debug message is issued when a client is trying to release the
 +lease for the address which is currently used by another client, i.e.
 +the 'client identifier' or 'chaddr' doesn't match between the client
 +and the lease. The first argument includes the client and the
 +transaction identification information. The second argument specifies
 +the leased address.
  
  % DHCP4_RESPONSE_FQDN_DATA %1: including FQDN option in the server's response: %2
  This debug message is issued when the server is adding the Client FQDN

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

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

diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 8816aa53d089cb3bf71fa0d6a089674b754afe86,1339efad95c16a724429cfcde4d49f96ecbd66b7..b04f4572284b4db6e51496fed5d0ad6d6d86cbff
--- 1/src/bin/dhcp6/tests/dhcp6_test_utils.cc
--- 2/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@@ -14,10 -14,10 +14,11 @@@
  
  #include <config.h>
  #include <gtest/gtest.h>
+ #include <dhcp/option6_status_code.h>
  #include <dhcp6/tests/dhcp6_test_utils.h>
  #include <dhcp6/json_config_parser.h>
 -#include <config/ccsession.h>
 +#include <util/pointer_util.h>
 +#include <cc/command_interpreter.h>
  #include <string.h>
  
  using namespace isc::data;

diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.h
Simple merge

diff --cc src/lib/dhcp/pkt4.h
Simple merge

diff --cc src/lib/dhcp/pkt6.cc
Simple merge

diff --cc src/lib/dhcp/tests/pkt6_unittest.cc
index fe99bcb45604945e71a488e46a37468c356aa1df,d015359765ed1a3ea8f0ad38de21f1b18f530e01..3deefcf5377a2334bf1af33f6700a47ee20cb724
mode 100644,100755..100644
--- 1/src/lib/dhcp/tests/pkt6_unittest.cc
--- 2/src/lib/dhcp/tests/pkt6_unittest.cc
+++ b/src/lib/dhcp/tests/pkt6_unittest.cc