[master] Merge branch 'trac5030'

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

diff --cc src/bin/dhcp6/json_config_parser.cc
index 914fbee53d45bc55f39d650ce9e97e6d75c51723,b14d7c8c77bd9619e80417dfb69b498b82787a55..bea936afdeee3345804bd9296721e9c150570d8d
--- 1/src/bin/dhcp6/json_config_parser.cc
--- 2/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@@ -907,20 -909,12 +905,26 @@@ configureDhcp6Server(Dhcpv6Srv&, isc::d
                  continue;
              }
  
 +            if (config_pair.first == "mac-sources") {
 +                MACSourcesListConfigParser parser;
 +                CfgMACSource& mac_source = CfgMgr::instance().getStagingCfg()->getMACSources();
 +                parser.parse(mac_source, config_pair.second);
 +                continue;
 +            }
 +
 +            if (config_pair.first == "control-socket") {
 +                ControlSocketParser parser;
 +                SrvConfigPtr srv_config = CfgMgr::instance().getStagingCfg();
 +                parser.parse(*srv_config, config_pair.second);
 +                continue;
 +            }
 +
+             if (config_pair.first == "host-reservation-identifiers") {
+                 HostReservationIdsParser6 parser;
+                 parser.parse(config_pair.second);
+                 continue;
+             }
+ 
              ParserPtr parser(createGlobal6DhcpConfigParser(config_pair.first,
                                                             config_pair.second));
              LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL, DHCP6_PARSER_CREATED)