[master] Finishing merge of trac5351 (user context / comment)

diff --cc ChangeLog
index 3376ec3262eb322eb57e81cf09880e9b619b8fbf,bbec06a9f060f19ec0834a383289777a38918ebf..80c53a6c4704a6c28d3c88802cc5c799d67a1272
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,3 +1,20 @@@
++1343. [func]          fdupont
++      User-context and comments are now supported in many new scopes:
++      global, shared-network, subnet, pool, host reservation, option,
++      option definition, client-class, control-socket, dhcp-ddns,
++      interfaces, loggers, and for DHCPv6 pd-pool and server-id.
++      (Trac #5351, git xxx)
++
++1342. [bug]           fdupont
++      Fixed subnets and host reservations returned by config-get and
++      config-write.
++      (Trac #5452, git xxx)
++
 +1341. [func]          razvan, andrei
 +      Significant update of Cassandra support. A lot of code for
 +      Cassandr Lease Manager has been updated and partially rewritten.
 +      (github #35, git 41795494720cd9886c1e98d21eaeefd94d674e37)
 +
  1340. [func]          marcin
        Added support for "dhcp-enable" and "dhcp-disable" commands in
        the DHCPv4 and DHCPv6 server.

diff --cc configure.ac
Simple merge

diff --cc doc/guide/dhcp4-srv.xml
Simple merge

diff --cc doc/guide/dhcp6-srv.xml
Simple merge

diff --cc src/bin/dhcp4/dhcp4_lexer.ll
Simple merge

diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc
index 8671c2cdd0a642b7fe5dfafadb1a03316f08b772,194cef0d75c8333ad51dc3af6368e7562ab86306..0653b5c7e1be2b2995e6991e6958595863b8a170
--- 1/src/bin/dhcp4/tests/config_parser_unittest.cc
--- 2/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@@ -10,7 -10,9 +10,8 @@@
  #include <gtest/gtest.h>
  
  #include <cc/command_interpreter.h>
 -#include <config/module_spec.h>
  #include <dhcp4/dhcp4_srv.h>
+ #include <dhcp4/ctrl_dhcp4_srv.h>
  #include <dhcp4/json_config_parser.h>
  #include <dhcp/option4_addrlst.h>
  #include <dhcp/option_custom.h>

diff --cc src/bin/dhcp6/dhcp6_lexer.ll
Simple merge

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

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

diff --cc src/lib/cc/data.cc
Simple merge

diff --cc src/lib/cc/data.h
Simple merge

diff --cc src/lib/dhcpsrv/cfg_option.cc
Simple merge