[master] Merge branch 'trac3806'

# Conflicts:
#	doc/guide/logging.xml

diff --cc doc/guide/logging.xml
index c965f96abf14c4a102568b8ac1ff31f489dddf21,57f208bd8c9fbd84b849bfd66d3db932fe57647a..bf6a0b9ccc81216b7827ebfc8be9d157cccbfd55
--- 1/doc/guide/logging.xml
--- 2/doc/guide/logging.xml
+++ b/doc/guide/logging.xml
@@@ -174,15 -180,17 +180,23 @@@
            </listitem>
            <listitem>
              <simpara><command>kea-dhcp4.hooks</command> - this logger is used
 -            to log messages pertaining to management of hooks libraries, e.g.
 +            to log messages related to management of hooks libraries, e.g.
-             registration and deregistration of the libraries.</simpara>
+             registration and deregistration of the libraries, and to the
 -            initialization of callouts execution for various hook points within
 -            the DHCPv4 server.</simpara>
++            initialization of the callouts execution for various hook points
++            within the DHCPv4 server.</simpara>
            </listitem>
            <listitem>
 -            <simpara><command>kea-dhcp4.ddns</command> - this logger is
 -            used by the DHCPv4 server to log messages related to the Client
 -            FQDN and Hostname option processing. It also includes log messages
 +            <simpara><command>kea-dhcp4.callouts</command> - this logger is used
 +            to log messages pertaining to the callouts registration and execution
 +            for the particular hook point.
 +            </simpara>
 +          </listitem>
++          <listitem>
++            <simpara><command>kea-dhcp4.ddns</command> - this logger is used by
++            the DHCPv4 server to log messages related to the Client FQDN and
++            Hostname option processing. It also includes log messages
+             related to the relevant DNS updates.</simpara>
+           </listitem>
            <listitem>
              <simpara><command>kea-dhcp4.hosts</command> - this logger is used
              within the libdhcpsrv and it logs messages related to the management
@@@ -208,15 -242,9 +248,15 @@@
            </listitem>
            <listitem>
              <simpara><command>kea-dhcp6.hooks</command> - this logger is used
-             to log messages related to management of hooks libraries, e.g.
 -            to log messages pertaining to management of hooks libraries, e.g.
++            during DHCPv6 hooks operation, i.e. anything related to user
              registration and deregistration of the libraries.</simpara>
            </listitem>
 +          <listitem>
 +            <simpara><command>kea-dhcp6.callouts</command> - this logger is used
 +            to log messages pertaining to the callouts registration and execution
 +            for the particular hook point.
 +            </simpara>
 +          </listitem>
            <listitem>
              <simpara><command>kea-dhcp6.hosts</command> - this logger is used
              within the libdhcpsrv and it logs messages related to the management

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