[master] Merge branch 'trac5044' (DUID configuration to SimpleParser)

# Conflicts:
#	src/bin/dhcp6/json_config_parser.cc

diff --cc src/bin/dhcp6/json_config_parser.cc
index bea936afdeee3345804bd9296721e9c150570d8d,c35631e7b4eb96537fc055c11ee5ae42ae0afd8e..76aa12f32c0c75bc9e3d5b04c2a4ba66d15c9571
--- 1/src/bin/dhcp6/json_config_parser.cc
--- 2/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@@ -724,9 -725,9 +724,8 @@@ DhcpConfigParser* createGlobal6DhcpConf
          parser = new ExpirationConfigParser();
      } else if (config_id.compare("client-classes") == 0) {
          parser = new ClientClassDefListParser(config_id, globalContext());
-     } else if (config_id.compare("server-id") == 0) {
-         parser = new DUIDConfigParser();
 +    // host-reservation-identifiers have been converted to SimpleParser already.
+     // server-id has been migrated to SimpleParser
 -    } else if (config_id.compare("host-reservation-identifiers") == 0) {
 -        parser = new HostReservationIdsParser6();
      } else {
          isc_throw(DhcpConfigError,
                  "unsupported global configuration parameter: "
@@@ -919,12 -920,13 +918,19 @@@ configureDhcp6Server(Dhcpv6Srv&, isc::d
                  continue;
              }
  
 +            if (config_pair.first == "host-reservation-identifiers") {
 +                HostReservationIdsParser6 parser;
 +                parser.parse(config_pair.second);
 +                continue;
 +            }
 +
+             if (config_pair.first == "server-id") {
+                 DUIDConfigParser parser;
+                 const CfgDUIDPtr& cfg = CfgMgr::instance().getStagingCfg()->getCfgDUID();
+                 parser.parse(cfg, config_pair.second);
+                 continue;
+             }
+ 
              ParserPtr parser(createGlobal6DhcpConfigParser(config_pair.first,
                                                             config_pair.second));
              LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL, DHCP6_PARSER_CREATED)

diff --cc src/bin/dhcp6/parser_context.cc
Simple merge