From: Francis Dupont <fdupont@isc.org>
Date: Wed, 29 Nov 2017 08:39:15 +0000 (+0000)
Subject: [trac5351] regen flex/bison
X-Git-Tag: trac5444_base~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff211701b7a1b2c18259e7dd911d102a64b8ea39;p=thirdparty%2Fkea.git

[trac5351] regen flex/bison
---

diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc
index 3c57bfd29d..478a9a5a03 100644
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@ -1588,18 +1588,18 @@ static const flex_int16_t yy_rule_linenum[159] =
       269,  278,  287,  296,  305,  316,  325,  334,  343,  352,
       362,  372,  382,  392,  402,  412,  422,  432,  442,  453,
       464,  475,  484,  494,  503,  513,  528,  544,  553,  562,
-      571,  580,  593,  606,  615,  625,  634,  643,  652,  662,
-      671,  680,  689,  698,  708,  717,  726,  735,  744,  753,
-      762,  771,  780,  789,  798,  808,  819,  829,  838,  848,
-      858,  868,  878,  888,  897,  907,  916,  925,  934,  943,
-      953,  963,  973,  982,  991, 1000, 1009, 1018, 1027, 1036,
-
-     1045, 1054, 1063, 1072, 1081, 1090, 1099, 1108, 1117, 1126,
-     1135, 1144, 1153, 1162, 1171, 1180, 1189, 1198, 1207, 1216,
-     1225, 1235, 1245, 1255, 1265, 1275, 1285, 1295, 1305, 1315,
-     1324, 1333, 1342, 1351, 1360, 1369, 1378, 1389, 1402, 1415,
-     1430, 1528, 1533, 1538, 1543, 1544, 1545, 1546, 1547, 1548,
-     1550, 1568, 1581, 1586, 1590, 1592, 1594, 1596
+      571,  580,  595,  610,  619,  629,  638,  647,  656,  666,
+      675,  684,  693,  702,  712,  721,  730,  739,  748,  757,
+      766,  775,  784,  793,  802,  812,  823,  833,  842,  852,
+      862,  872,  882,  892,  901,  911,  920,  929,  938,  947,
+      957,  967,  977,  986,  995, 1004, 1013, 1022, 1031, 1040,
+
+     1049, 1058, 1067, 1076, 1085, 1094, 1103, 1112, 1121, 1130,
+     1139, 1148, 1157, 1166, 1175, 1184, 1193, 1202, 1211, 1220,
+     1229, 1239, 1249, 1259, 1269, 1279, 1289, 1299, 1309, 1319,
+     1328, 1337, 1346, 1355, 1364, 1373, 1382, 1393, 1406, 1419,
+     1434, 1532, 1537, 1542, 1547, 1548, 1549, 1550, 1551, 1552,
+     1554, 1572, 1585, 1590, 1594, 1596, 1598, 1600
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -2692,6 +2692,8 @@ YY_RULE_SETUP
     case isc::dhcp::Parser4Context::POOLS:
     case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::OPTION_DEF:
+    case isc::dhcp::Parser4Context::OPTION_DATA:
+    case isc::dhcp::Parser4Context::CLIENT_CLASSES:
         return isc::dhcp::Dhcp4Parser::make_USER_CONTEXT(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("user-context", driver.loc_);
@@ -2700,7 +2702,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 593 "dhcp4_lexer.ll"
+#line 595 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -2708,6 +2710,8 @@ YY_RULE_SETUP
     case isc::dhcp::Parser4Context::POOLS:
     case isc::dhcp::Parser4Context::SHARED_NETWORK:
     case isc::dhcp::Parser4Context::OPTION_DEF:
+    case isc::dhcp::Parser4Context::OPTION_DATA:
+    case isc::dhcp::Parser4Context::CLIENT_CLASSES:
         return isc::dhcp::Dhcp4Parser::make_COMMENT(driver.loc_);
     default:
         return isc::dhcp::Dhcp4Parser::make_STRING("comment", driver.loc_);
@@ -2716,7 +2720,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 606 "dhcp4_lexer.ll"
+#line 610 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -2728,7 +2732,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 615 "dhcp4_lexer.ll"
+#line 619 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -2741,7 +2745,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 625 "dhcp4_lexer.ll"
+#line 629 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -2753,7 +2757,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 634 "dhcp4_lexer.ll"
+#line 638 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -2765,7 +2769,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 643 "dhcp4_lexer.ll"
+#line 647 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -2777,7 +2781,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 652 "dhcp4_lexer.ll"
+#line 656 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -2790,7 +2794,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 662 "dhcp4_lexer.ll"
+#line 666 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -2802,7 +2806,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 671 "dhcp4_lexer.ll"
+#line 675 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -2814,7 +2818,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 680 "dhcp4_lexer.ll"
+#line 684 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -2826,7 +2830,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 689 "dhcp4_lexer.ll"
+#line 693 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATION_MODE:
@@ -2838,7 +2842,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 698 "dhcp4_lexer.ll"
+#line 702 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -2851,7 +2855,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 708 "dhcp4_lexer.ll"
+#line 712 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -2863,7 +2867,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 717 "dhcp4_lexer.ll"
+#line 721 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -2875,7 +2879,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 726 "dhcp4_lexer.ll"
+#line 730 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGING:
@@ -2887,7 +2891,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 735 "dhcp4_lexer.ll"
+#line 739 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -2899,7 +2903,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 744 "dhcp4_lexer.ll"
+#line 748 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -2911,7 +2915,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 753 "dhcp4_lexer.ll"
+#line 757 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -2923,7 +2927,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 762 "dhcp4_lexer.ll"
+#line 766 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -2935,7 +2939,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 771 "dhcp4_lexer.ll"
+#line 775 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -2947,7 +2951,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 780 "dhcp4_lexer.ll"
+#line 784 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OUTPUT_OPTIONS:
@@ -2959,7 +2963,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 789 "dhcp4_lexer.ll"
+#line 793 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LOGGERS:
@@ -2971,7 +2975,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 798 "dhcp4_lexer.ll"
+#line 802 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -2984,7 +2988,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 808 "dhcp4_lexer.ll"
+#line 812 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -2998,7 +3002,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 819 "dhcp4_lexer.ll"
+#line 823 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CLIENT_CLASSES:
@@ -3011,7 +3015,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 829 "dhcp4_lexer.ll"
+#line 833 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3023,7 +3027,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 838 "dhcp4_lexer.ll"
+#line 842 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3036,7 +3040,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 848 "dhcp4_lexer.ll"
+#line 852 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3049,7 +3053,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 858 "dhcp4_lexer.ll"
+#line 862 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3062,7 +3066,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 868 "dhcp4_lexer.ll"
+#line 872 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3075,7 +3079,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 878 "dhcp4_lexer.ll"
+#line 882 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3088,7 +3092,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 888 "dhcp4_lexer.ll"
+#line 892 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RESERVATIONS:
@@ -3100,7 +3104,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 897 "dhcp4_lexer.ll"
+#line 901 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3113,7 +3117,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 907 "dhcp4_lexer.ll"
+#line 911 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DATA:
@@ -3125,7 +3129,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 916 "dhcp4_lexer.ll"
+#line 920 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3137,7 +3141,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 925 "dhcp4_lexer.ll"
+#line 929 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3149,7 +3153,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 934 "dhcp4_lexer.ll"
+#line 938 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::OPTION_DEF:
@@ -3161,7 +3165,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 943 "dhcp4_lexer.ll"
+#line 947 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3174,7 +3178,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 953 "dhcp4_lexer.ll"
+#line 957 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::RELAY:
@@ -3187,7 +3191,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 963 "dhcp4_lexer.ll"
+#line 967 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3199,7 +3203,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 973 "dhcp4_lexer.ll"
+#line 977 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOOKS_LIBRARIES:
@@ -3211,7 +3215,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 982 "dhcp4_lexer.ll"
+#line 986 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::HOOKS_LIBRARIES:
@@ -3223,7 +3227,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 991 "dhcp4_lexer.ll"
+#line 995 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3235,7 +3239,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 1000 "dhcp4_lexer.ll"
+#line 1004 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3247,7 +3251,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 1009 "dhcp4_lexer.ll"
+#line 1013 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3259,7 +3263,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 1018 "dhcp4_lexer.ll"
+#line 1022 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3271,7 +3275,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 1027 "dhcp4_lexer.ll"
+#line 1031 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3283,7 +3287,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 1036 "dhcp4_lexer.ll"
+#line 1040 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3295,7 +3299,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 1045 "dhcp4_lexer.ll"
+#line 1049 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING:
@@ -3307,7 +3311,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 1054 "dhcp4_lexer.ll"
+#line 1058 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3319,7 +3323,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 1063 "dhcp4_lexer.ll"
+#line 1067 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3331,7 +3335,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 1072 "dhcp4_lexer.ll"
+#line 1076 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONTROL_SOCKET:
@@ -3343,7 +3347,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 1081 "dhcp4_lexer.ll"
+#line 1085 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONTROL_SOCKET:
@@ -3355,7 +3359,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 1090 "dhcp4_lexer.ll"
+#line 1094 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3367,7 +3371,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 1099 "dhcp4_lexer.ll"
+#line 1103 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3379,7 +3383,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 1108 "dhcp4_lexer.ll"
+#line 1112 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3391,7 +3395,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 1117 "dhcp4_lexer.ll"
+#line 1121 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3403,7 +3407,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 1126 "dhcp4_lexer.ll"
+#line 1130 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3415,7 +3419,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 1135 "dhcp4_lexer.ll"
+#line 1139 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3427,7 +3431,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 1144 "dhcp4_lexer.ll"
+#line 1148 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3439,7 +3443,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 1153 "dhcp4_lexer.ll"
+#line 1157 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3451,7 +3455,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 1162 "dhcp4_lexer.ll"
+#line 1166 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3463,7 +3467,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 1171 "dhcp4_lexer.ll"
+#line 1175 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3475,7 +3479,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 1180 "dhcp4_lexer.ll"
+#line 1184 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3487,7 +3491,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 1189 "dhcp4_lexer.ll"
+#line 1193 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3499,7 +3503,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 1198 "dhcp4_lexer.ll"
+#line 1202 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3511,7 +3515,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 1207 "dhcp4_lexer.ll"
+#line 1211 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3523,7 +3527,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 1216 "dhcp4_lexer.ll"
+#line 1220 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP_DDNS:
@@ -3535,7 +3539,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 1225 "dhcp4_lexer.ll"
+#line 1229 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -3548,7 +3552,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 1235 "dhcp4_lexer.ll"
+#line 1239 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
@@ -3561,7 +3565,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 1245 "dhcp4_lexer.ll"
+#line 1249 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) {
@@ -3574,7 +3578,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 1255 "dhcp4_lexer.ll"
+#line 1259 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3587,7 +3591,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 1265 "dhcp4_lexer.ll"
+#line 1269 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3600,7 +3604,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 1275 "dhcp4_lexer.ll"
+#line 1279 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3613,7 +3617,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 1285 "dhcp4_lexer.ll"
+#line 1289 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3626,7 +3630,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 1295 "dhcp4_lexer.ll"
+#line 1299 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3639,7 +3643,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 1305 "dhcp4_lexer.ll"
+#line 1309 "dhcp4_lexer.ll"
 {
     /* dhcp-ddns value keywords are case insensitive */
     if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) {
@@ -3652,7 +3656,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 1315 "dhcp4_lexer.ll"
+#line 1319 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -3664,7 +3668,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 1324 "dhcp4_lexer.ll"
+#line 1328 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -3676,7 +3680,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 1333 "dhcp4_lexer.ll"
+#line 1337 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::CONFIG:
@@ -3688,7 +3692,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 1342 "dhcp4_lexer.ll"
+#line 1346 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3700,7 +3704,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 1351 "dhcp4_lexer.ll"
+#line 1355 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3712,7 +3716,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 1360 "dhcp4_lexer.ll"
+#line 1364 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
@@ -3724,7 +3728,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 1369 "dhcp4_lexer.ll"
+#line 1373 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3736,7 +3740,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 1378 "dhcp4_lexer.ll"
+#line 1382 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3750,7 +3754,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1389 "dhcp4_lexer.ll"
+#line 1393 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3766,7 +3770,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 1402 "dhcp4_lexer.ll"
+#line 1406 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3782,7 +3786,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 1415 "dhcp4_lexer.ll"
+#line 1419 "dhcp4_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::DHCP4:
@@ -3798,7 +3802,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 1430 "dhcp4_lexer.ll"
+#line 1434 "dhcp4_lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -3900,7 +3904,7 @@ YY_RULE_SETUP
 case 142:
 /* rule 142 can match eol */
 YY_RULE_SETUP
-#line 1528 "dhcp4_lexer.ll"
+#line 1532 "dhcp4_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -3909,7 +3913,7 @@ YY_RULE_SETUP
 case 143:
 /* rule 143 can match eol */
 YY_RULE_SETUP
-#line 1533 "dhcp4_lexer.ll"
+#line 1537 "dhcp4_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -3917,7 +3921,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1538 "dhcp4_lexer.ll"
+#line 1542 "dhcp4_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -3925,37 +3929,37 @@ YY_RULE_SETUP
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 1543 "dhcp4_lexer.ll"
+#line 1547 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 1544 "dhcp4_lexer.ll"
+#line 1548 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1545 "dhcp4_lexer.ll"
+#line 1549 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1546 "dhcp4_lexer.ll"
+#line 1550 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1547 "dhcp4_lexer.ll"
+#line 1551 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 1548 "dhcp4_lexer.ll"
+#line 1552 "dhcp4_lexer.ll"
 { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1550 "dhcp4_lexer.ll"
+#line 1554 "dhcp4_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -3976,7 +3980,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1568 "dhcp4_lexer.ll"
+#line 1572 "dhcp4_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -3992,7 +3996,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1581 "dhcp4_lexer.ll"
+#line 1585 "dhcp4_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -4000,33 +4004,33 @@ YY_RULE_SETUP
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 1586 "dhcp4_lexer.ll"
+#line 1590 "dhcp4_lexer.ll"
 {
    return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
 }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 1590 "dhcp4_lexer.ll"
+#line 1594 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 1592 "dhcp4_lexer.ll"
+#line 1596 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1594 "dhcp4_lexer.ll"
+#line 1598 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 1596 "dhcp4_lexer.ll"
+#line 1600 "dhcp4_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1598 "dhcp4_lexer.ll"
+#line 1602 "dhcp4_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp4Parser::make_END(driver.loc_);
@@ -4052,10 +4056,10 @@ case YY_STATE_EOF(INITIAL):
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 1621 "dhcp4_lexer.ll"
+#line 1625 "dhcp4_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 4058 "dhcp4_lexer.cc"
+#line 4062 "dhcp4_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5160,7 +5164,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1621 "dhcp4_lexer.ll"
+#line 1625 "dhcp4_lexer.ll"
 
 
 using namespace isc::dhcp;
diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc
index 954312c04e..3ab20f0f34 100644
--- a/src/bin/dhcp4/dhcp4_parser.cc
+++ b/src/bin/dhcp4/dhcp4_parser.cc
@@ -2179,16 +2179,16 @@ namespace isc { namespace dhcp {
 #line 2180 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 359:
-#line 1269 "dhcp4_parser.yy" // lalr1.cc:859
+  case 361:
+#line 1271 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2188 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 360:
-#line 1271 "dhcp4_parser.yy" // lalr1.cc:859
+  case 362:
+#line 1273 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
@@ -2197,8 +2197,8 @@ namespace isc { namespace dhcp {
 #line 2198 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 363:
-#line 1281 "dhcp4_parser.yy" // lalr1.cc:859
+  case 365:
+#line 1283 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
@@ -2206,8 +2206,8 @@ namespace isc { namespace dhcp {
 #line 2207 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 364:
-#line 1286 "dhcp4_parser.yy" // lalr1.cc:859
+  case 366:
+#line 1288 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
@@ -2215,8 +2215,8 @@ namespace isc { namespace dhcp {
 #line 2216 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 365:
-#line 1294 "dhcp4_parser.yy" // lalr1.cc:859
+  case 367:
+#line 1296 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
@@ -2226,8 +2226,8 @@ namespace isc { namespace dhcp {
 #line 2227 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 366:
-#line 1299 "dhcp4_parser.yy" // lalr1.cc:859
+  case 368:
+#line 1301 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2235,8 +2235,8 @@ namespace isc { namespace dhcp {
 #line 2236 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 371:
-#line 1314 "dhcp4_parser.yy" // lalr1.cc:859
+  case 373:
+#line 1316 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2245,8 +2245,8 @@ namespace isc { namespace dhcp {
 #line 2246 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 372:
-#line 1318 "dhcp4_parser.yy" // lalr1.cc:859
+  case 374:
+#line 1320 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2255,8 +2255,8 @@ namespace isc { namespace dhcp {
 #line 2256 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 373:
-#line 1324 "dhcp4_parser.yy" // lalr1.cc:859
+  case 375:
+#line 1326 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2265,8 +2265,8 @@ namespace isc { namespace dhcp {
 #line 2266 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 374:
-#line 1328 "dhcp4_parser.yy" // lalr1.cc:859
+  case 376:
+#line 1330 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2275,16 +2275,16 @@ namespace isc { namespace dhcp {
 #line 2276 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 382:
-#line 1345 "dhcp4_parser.yy" // lalr1.cc:859
+  case 384:
+#line 1347 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2284 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 383:
-#line 1347 "dhcp4_parser.yy" // lalr1.cc:859
+  case 385:
+#line 1349 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
@@ -2293,16 +2293,16 @@ namespace isc { namespace dhcp {
 #line 2294 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 384:
-#line 1353 "dhcp4_parser.yy" // lalr1.cc:859
+  case 386:
+#line 1355 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2302 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 385:
-#line 1355 "dhcp4_parser.yy" // lalr1.cc:859
+  case 387:
+#line 1357 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->combine_set("user-context", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2310,16 +2310,16 @@ namespace isc { namespace dhcp {
 #line 2311 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 386:
-#line 1360 "dhcp4_parser.yy" // lalr1.cc:859
+  case 388:
+#line 1362 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2319 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 387:
-#line 1362 "dhcp4_parser.yy" // lalr1.cc:859
+  case 389:
+#line 1364 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr e(new MapElement(ctx.loc2pos(yystack_[3].location)));
     e->set("comment", yystack_[0].value.as< ElementPtr > ());
@@ -2329,8 +2329,8 @@ namespace isc { namespace dhcp {
 #line 2330 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 388:
-#line 1372 "dhcp4_parser.yy" // lalr1.cc:859
+  case 390:
+#line 1374 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
@@ -2340,8 +2340,8 @@ namespace isc { namespace dhcp {
 #line 2341 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 389:
-#line 1377 "dhcp4_parser.yy" // lalr1.cc:859
+  case 391:
+#line 1379 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2349,8 +2349,8 @@ namespace isc { namespace dhcp {
 #line 2350 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 394:
-#line 1390 "dhcp4_parser.yy" // lalr1.cc:859
+  case 396:
+#line 1392 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2359,8 +2359,8 @@ namespace isc { namespace dhcp {
 #line 2360 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 395:
-#line 1394 "dhcp4_parser.yy" // lalr1.cc:859
+  case 397:
+#line 1396 "dhcp4_parser.yy" // lalr1.cc:859
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
@@ -2368,8 +2368,8 @@ namespace isc { namespace dhcp {
 #line 2369 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 396:
-#line 1399 "dhcp4_parser.yy" // lalr1.cc:859
+  case 398:
+#line 1401 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2378,8 +2378,8 @@ namespace isc { namespace dhcp {
 #line 2379 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 397:
-#line 1403 "dhcp4_parser.yy" // lalr1.cc:859
+  case 399:
+#line 1405 "dhcp4_parser.yy" // lalr1.cc:859
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
@@ -2387,16 +2387,16 @@ namespace isc { namespace dhcp {
 #line 2388 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 415:
-#line 1432 "dhcp4_parser.yy" // lalr1.cc:859
+  case 417:
+#line 1434 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2396 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 416:
-#line 1434 "dhcp4_parser.yy" // lalr1.cc:859
+  case 418:
+#line 1436 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr next_server(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("next-server", next_server);
@@ -2405,16 +2405,16 @@ namespace isc { namespace dhcp {
 #line 2406 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 417:
-#line 1440 "dhcp4_parser.yy" // lalr1.cc:859
+  case 419:
+#line 1442 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2414 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 418:
-#line 1442 "dhcp4_parser.yy" // lalr1.cc:859
+  case 420:
+#line 1444 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr srv(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-hostname", srv);
@@ -2423,16 +2423,16 @@ namespace isc { namespace dhcp {
 #line 2424 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 419:
-#line 1448 "dhcp4_parser.yy" // lalr1.cc:859
+  case 421:
+#line 1450 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2432 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 420:
-#line 1450 "dhcp4_parser.yy" // lalr1.cc:859
+  case 422:
+#line 1452 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr bootfile(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("boot-file-name", bootfile);
@@ -2441,16 +2441,16 @@ namespace isc { namespace dhcp {
 #line 2442 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 421:
-#line 1456 "dhcp4_parser.yy" // lalr1.cc:859
+  case 423:
+#line 1458 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2450 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 422:
-#line 1458 "dhcp4_parser.yy" // lalr1.cc:859
+  case 424:
+#line 1460 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", addr);
@@ -2459,16 +2459,16 @@ namespace isc { namespace dhcp {
 #line 2460 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 423:
-#line 1464 "dhcp4_parser.yy" // lalr1.cc:859
+  case 425:
+#line 1466 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2468 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 424:
-#line 1466 "dhcp4_parser.yy" // lalr1.cc:859
+  case 426:
+#line 1468 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
@@ -2477,16 +2477,16 @@ namespace isc { namespace dhcp {
 #line 2478 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 425:
-#line 1472 "dhcp4_parser.yy" // lalr1.cc:859
+  case 427:
+#line 1474 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2486 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 426:
-#line 1474 "dhcp4_parser.yy" // lalr1.cc:859
+  case 428:
+#line 1476 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
@@ -2495,16 +2495,16 @@ namespace isc { namespace dhcp {
 #line 2496 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 427:
-#line 1480 "dhcp4_parser.yy" // lalr1.cc:859
+  case 429:
+#line 1482 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2504 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 428:
-#line 1482 "dhcp4_parser.yy" // lalr1.cc:859
+  case 430:
+#line 1484 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-id", hw);
@@ -2513,16 +2513,16 @@ namespace isc { namespace dhcp {
 #line 2514 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 429:
-#line 1488 "dhcp4_parser.yy" // lalr1.cc:859
+  case 431:
+#line 1490 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2522 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 430:
-#line 1490 "dhcp4_parser.yy" // lalr1.cc:859
+  case 432:
+#line 1492 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("circuit-id", hw);
@@ -2531,16 +2531,16 @@ namespace isc { namespace dhcp {
 #line 2532 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 431:
-#line 1496 "dhcp4_parser.yy" // lalr1.cc:859
+  case 433:
+#line 1498 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2540 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 432:
-#line 1498 "dhcp4_parser.yy" // lalr1.cc:859
+  case 434:
+#line 1500 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
@@ -2549,16 +2549,16 @@ namespace isc { namespace dhcp {
 #line 2550 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 433:
-#line 1504 "dhcp4_parser.yy" // lalr1.cc:859
+  case 435:
+#line 1506 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2558 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 434:
-#line 1506 "dhcp4_parser.yy" // lalr1.cc:859
+  case 436:
+#line 1508 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
@@ -2567,8 +2567,8 @@ namespace isc { namespace dhcp {
 #line 2568 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 435:
-#line 1512 "dhcp4_parser.yy" // lalr1.cc:859
+  case 437:
+#line 1514 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
@@ -2578,8 +2578,8 @@ namespace isc { namespace dhcp {
 #line 2579 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 436:
-#line 1517 "dhcp4_parser.yy" // lalr1.cc:859
+  case 438:
+#line 1519 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2587,8 +2587,8 @@ namespace isc { namespace dhcp {
 #line 2588 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 437:
-#line 1525 "dhcp4_parser.yy" // lalr1.cc:859
+  case 439:
+#line 1527 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
@@ -2598,8 +2598,8 @@ namespace isc { namespace dhcp {
 #line 2599 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 438:
-#line 1530 "dhcp4_parser.yy" // lalr1.cc:859
+  case 440:
+#line 1532 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2607,16 +2607,16 @@ namespace isc { namespace dhcp {
 #line 2608 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 439:
-#line 1535 "dhcp4_parser.yy" // lalr1.cc:859
+  case 441:
+#line 1537 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2616 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 440:
-#line 1537 "dhcp4_parser.yy" // lalr1.cc:859
+  case 442:
+#line 1539 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr ip(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", ip);
@@ -2625,8 +2625,8 @@ namespace isc { namespace dhcp {
 #line 2626 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 441:
-#line 1546 "dhcp4_parser.yy" // lalr1.cc:859
+  case 443:
+#line 1548 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
@@ -2636,8 +2636,8 @@ namespace isc { namespace dhcp {
 #line 2637 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 442:
-#line 1551 "dhcp4_parser.yy" // lalr1.cc:859
+  case 444:
+#line 1553 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2645,8 +2645,8 @@ namespace isc { namespace dhcp {
 #line 2646 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 445:
-#line 1560 "dhcp4_parser.yy" // lalr1.cc:859
+  case 447:
+#line 1562 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2655,8 +2655,8 @@ namespace isc { namespace dhcp {
 #line 2656 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 446:
-#line 1564 "dhcp4_parser.yy" // lalr1.cc:859
+  case 448:
+#line 1566 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2665,16 +2665,16 @@ namespace isc { namespace dhcp {
 #line 2666 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 460:
-#line 1590 "dhcp4_parser.yy" // lalr1.cc:859
+  case 464:
+#line 1594 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2674 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 461:
-#line 1592 "dhcp4_parser.yy" // lalr1.cc:859
+  case 465:
+#line 1596 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
@@ -2683,8 +2683,8 @@ namespace isc { namespace dhcp {
 #line 2684 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 462:
-#line 1602 "dhcp4_parser.yy" // lalr1.cc:859
+  case 466:
+#line 1606 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
@@ -2692,8 +2692,8 @@ namespace isc { namespace dhcp {
 #line 2693 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 463:
-#line 1609 "dhcp4_parser.yy" // lalr1.cc:859
+  case 467:
+#line 1613 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
@@ -2703,8 +2703,8 @@ namespace isc { namespace dhcp {
 #line 2704 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 464:
-#line 1614 "dhcp4_parser.yy" // lalr1.cc:859
+  case 468:
+#line 1618 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2712,16 +2712,16 @@ namespace isc { namespace dhcp {
 #line 2713 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 469:
-#line 1627 "dhcp4_parser.yy" // lalr1.cc:859
+  case 473:
+#line 1631 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2721 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 470:
-#line 1629 "dhcp4_parser.yy" // lalr1.cc:859
+  case 474:
+#line 1633 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
@@ -2730,16 +2730,16 @@ namespace isc { namespace dhcp {
 #line 2731 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 471:
-#line 1635 "dhcp4_parser.yy" // lalr1.cc:859
+  case 475:
+#line 1639 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2739 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 472:
-#line 1637 "dhcp4_parser.yy" // lalr1.cc:859
+  case 476:
+#line 1641 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
@@ -2748,8 +2748,8 @@ namespace isc { namespace dhcp {
 #line 2749 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 473:
-#line 1645 "dhcp4_parser.yy" // lalr1.cc:859
+  case 477:
+#line 1649 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
@@ -2759,8 +2759,8 @@ namespace isc { namespace dhcp {
 #line 2760 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 474:
-#line 1650 "dhcp4_parser.yy" // lalr1.cc:859
+  case 478:
+#line 1654 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -2770,8 +2770,8 @@ namespace isc { namespace dhcp {
 #line 2771 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 475:
-#line 1657 "dhcp4_parser.yy" // lalr1.cc:859
+  case 479:
+#line 1661 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2780,8 +2780,8 @@ namespace isc { namespace dhcp {
 #line 2781 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 476:
-#line 1661 "dhcp4_parser.yy" // lalr1.cc:859
+  case 480:
+#line 1665 "dhcp4_parser.yy" // lalr1.cc:859
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2790,8 +2790,8 @@ namespace isc { namespace dhcp {
 #line 2791 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 494:
-#line 1688 "dhcp4_parser.yy" // lalr1.cc:859
+  case 498:
+#line 1692 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
@@ -2799,16 +2799,16 @@ namespace isc { namespace dhcp {
 #line 2800 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 495:
-#line 1693 "dhcp4_parser.yy" // lalr1.cc:859
+  case 499:
+#line 1697 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2808 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 496:
-#line 1695 "dhcp4_parser.yy" // lalr1.cc:859
+  case 500:
+#line 1699 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
@@ -2817,16 +2817,16 @@ namespace isc { namespace dhcp {
 #line 2818 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 497:
-#line 1701 "dhcp4_parser.yy" // lalr1.cc:859
+  case 501:
+#line 1705 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2826 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 498:
-#line 1703 "dhcp4_parser.yy" // lalr1.cc:859
+  case 502:
+#line 1707 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
@@ -2835,8 +2835,8 @@ namespace isc { namespace dhcp {
 #line 2836 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 499:
-#line 1709 "dhcp4_parser.yy" // lalr1.cc:859
+  case 503:
+#line 1713 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
@@ -2844,16 +2844,16 @@ namespace isc { namespace dhcp {
 #line 2845 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 500:
-#line 1714 "dhcp4_parser.yy" // lalr1.cc:859
+  case 504:
+#line 1718 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2853 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 501:
-#line 1716 "dhcp4_parser.yy" // lalr1.cc:859
+  case 505:
+#line 1720 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
@@ -2862,8 +2862,8 @@ namespace isc { namespace dhcp {
 #line 2863 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 502:
-#line 1722 "dhcp4_parser.yy" // lalr1.cc:859
+  case 506:
+#line 1726 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
@@ -2871,8 +2871,8 @@ namespace isc { namespace dhcp {
 #line 2872 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 503:
-#line 1727 "dhcp4_parser.yy" // lalr1.cc:859
+  case 507:
+#line 1731 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
@@ -2880,16 +2880,16 @@ namespace isc { namespace dhcp {
 #line 2881 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 504:
-#line 1732 "dhcp4_parser.yy" // lalr1.cc:859
+  case 508:
+#line 1736 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
 #line 2889 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 505:
-#line 1734 "dhcp4_parser.yy" // lalr1.cc:859
+  case 509:
+#line 1738 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2897,28 +2897,28 @@ namespace isc { namespace dhcp {
 #line 2898 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 506:
-#line 1740 "dhcp4_parser.yy" // lalr1.cc:859
+  case 510:
+#line 1744 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
 #line 2904 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 507:
-#line 1741 "dhcp4_parser.yy" // lalr1.cc:859
+  case 511:
+#line 1745 "dhcp4_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
 #line 2910 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 508:
-#line 1744 "dhcp4_parser.yy" // lalr1.cc:859
+  case 512:
+#line 1748 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
 #line 2918 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 509:
-#line 1746 "dhcp4_parser.yy" // lalr1.cc:859
+  case 513:
+#line 1750 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
@@ -2927,8 +2927,8 @@ namespace isc { namespace dhcp {
 #line 2928 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 510:
-#line 1752 "dhcp4_parser.yy" // lalr1.cc:859
+  case 514:
+#line 1756 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-include-fqdn", b);
@@ -2936,8 +2936,8 @@ namespace isc { namespace dhcp {
 #line 2937 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 511:
-#line 1757 "dhcp4_parser.yy" // lalr1.cc:859
+  case 515:
+#line 1761 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
@@ -2945,8 +2945,8 @@ namespace isc { namespace dhcp {
 #line 2946 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 512:
-#line 1762 "dhcp4_parser.yy" // lalr1.cc:859
+  case 516:
+#line 1766 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
@@ -2954,16 +2954,16 @@ namespace isc { namespace dhcp {
 #line 2955 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 513:
-#line 1767 "dhcp4_parser.yy" // lalr1.cc:859
+  case 517:
+#line 1771 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
 #line 2963 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 514:
-#line 1769 "dhcp4_parser.yy" // lalr1.cc:859
+  case 518:
+#line 1773 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2971,40 +2971,40 @@ namespace isc { namespace dhcp {
 #line 2972 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 515:
-#line 1775 "dhcp4_parser.yy" // lalr1.cc:859
+  case 519:
+#line 1779 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); 
       }
 #line 2980 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 516:
-#line 1778 "dhcp4_parser.yy" // lalr1.cc:859
+  case 520:
+#line 1782 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
 #line 2988 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 517:
-#line 1781 "dhcp4_parser.yy" // lalr1.cc:859
+  case 521:
+#line 1785 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
 #line 2996 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 518:
-#line 1784 "dhcp4_parser.yy" // lalr1.cc:859
+  case 522:
+#line 1788 "dhcp4_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3004 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 519:
-#line 1787 "dhcp4_parser.yy" // lalr1.cc:859
+  case 523:
+#line 1791 "dhcp4_parser.yy" // lalr1.cc:859
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
@@ -3012,16 +3012,16 @@ namespace isc { namespace dhcp {
 #line 3013 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 520:
-#line 1793 "dhcp4_parser.yy" // lalr1.cc:859
+  case 524:
+#line 1797 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3021 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 521:
-#line 1795 "dhcp4_parser.yy" // lalr1.cc:859
+  case 525:
+#line 1799 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
@@ -3030,16 +3030,16 @@ namespace isc { namespace dhcp {
 #line 3031 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 522:
-#line 1803 "dhcp4_parser.yy" // lalr1.cc:859
+  case 526:
+#line 1807 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3039 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 523:
-#line 1805 "dhcp4_parser.yy" // lalr1.cc:859
+  case 527:
+#line 1809 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3047,16 +3047,16 @@ namespace isc { namespace dhcp {
 #line 3048 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 524:
-#line 1810 "dhcp4_parser.yy" // lalr1.cc:859
+  case 528:
+#line 1814 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3056 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 525:
-#line 1812 "dhcp4_parser.yy" // lalr1.cc:859
+  case 529:
+#line 1816 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3064,16 +3064,16 @@ namespace isc { namespace dhcp {
 #line 3065 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 526:
-#line 1817 "dhcp4_parser.yy" // lalr1.cc:859
+  case 530:
+#line 1821 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3073 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 527:
-#line 1819 "dhcp4_parser.yy" // lalr1.cc:859
+  case 531:
+#line 1823 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3081,8 +3081,8 @@ namespace isc { namespace dhcp {
 #line 3082 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 528:
-#line 1829 "dhcp4_parser.yy" // lalr1.cc:859
+  case 532:
+#line 1833 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
@@ -3092,8 +3092,8 @@ namespace isc { namespace dhcp {
 #line 3093 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 529:
-#line 1834 "dhcp4_parser.yy" // lalr1.cc:859
+  case 533:
+#line 1838 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3101,8 +3101,8 @@ namespace isc { namespace dhcp {
 #line 3102 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 533:
-#line 1851 "dhcp4_parser.yy" // lalr1.cc:859
+  case 537:
+#line 1855 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -3112,8 +3112,8 @@ namespace isc { namespace dhcp {
 #line 3113 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 534:
-#line 1856 "dhcp4_parser.yy" // lalr1.cc:859
+  case 538:
+#line 1860 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3121,8 +3121,8 @@ namespace isc { namespace dhcp {
 #line 3122 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 537:
-#line 1868 "dhcp4_parser.yy" // lalr1.cc:859
+  case 541:
+#line 1872 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -3131,16 +3131,16 @@ namespace isc { namespace dhcp {
 #line 3132 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 538:
-#line 1872 "dhcp4_parser.yy" // lalr1.cc:859
+  case 542:
+#line 1876 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
 #line 3140 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 546:
-#line 1887 "dhcp4_parser.yy" // lalr1.cc:859
+  case 550:
+#line 1891 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -3148,16 +3148,16 @@ namespace isc { namespace dhcp {
 #line 3149 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 547:
-#line 1892 "dhcp4_parser.yy" // lalr1.cc:859
+  case 551:
+#line 1896 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3157 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 548:
-#line 1894 "dhcp4_parser.yy" // lalr1.cc:859
+  case 552:
+#line 1898 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3166,8 +3166,8 @@ namespace isc { namespace dhcp {
 #line 3167 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 549:
-#line 1900 "dhcp4_parser.yy" // lalr1.cc:859
+  case 553:
+#line 1904 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3177,8 +3177,8 @@ namespace isc { namespace dhcp {
 #line 3178 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 550:
-#line 1905 "dhcp4_parser.yy" // lalr1.cc:859
+  case 554:
+#line 1909 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3186,8 +3186,8 @@ namespace isc { namespace dhcp {
 #line 3187 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 553:
-#line 1914 "dhcp4_parser.yy" // lalr1.cc:859
+  case 557:
+#line 1918 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3196,24 +3196,24 @@ namespace isc { namespace dhcp {
 #line 3197 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 554:
-#line 1918 "dhcp4_parser.yy" // lalr1.cc:859
+  case 558:
+#line 1922 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
 #line 3205 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 561:
-#line 1932 "dhcp4_parser.yy" // lalr1.cc:859
+  case 565:
+#line 1936 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3213 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 562:
-#line 1934 "dhcp4_parser.yy" // lalr1.cc:859
+  case 566:
+#line 1938 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -3222,8 +3222,8 @@ namespace isc { namespace dhcp {
 #line 3223 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 563:
-#line 1940 "dhcp4_parser.yy" // lalr1.cc:859
+  case 567:
+#line 1944 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -3231,8 +3231,8 @@ namespace isc { namespace dhcp {
 #line 3232 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 564:
-#line 1945 "dhcp4_parser.yy" // lalr1.cc:859
+  case 568:
+#line 1949 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -3240,8 +3240,8 @@ namespace isc { namespace dhcp {
 #line 3241 "dhcp4_parser.cc" // lalr1.cc:859
     break;
 
-  case 565:
-#line 1950 "dhcp4_parser.yy" // lalr1.cc:859
+  case 569:
+#line 1954 "dhcp4_parser.yy" // lalr1.cc:859
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -3505,105 +3505,105 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short int Dhcp4Parser::yypact_ninf_ = -717;
+  const short int Dhcp4Parser::yypact_ninf_ = -734;
 
   const signed char Dhcp4Parser::yytable_ninf_ = -1;
 
   const short int
   Dhcp4Parser::yypact_[] =
   {
-     259,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,    59,    18,    19,    56,    58,    76,    80,
-      82,    91,    95,   126,   137,   145,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-      18,    17,     4,   134,    94,    26,    83,   164,   143,   142,
-     220,   -28,   275,  -717,   166,   202,   219,   216,   232,  -717,
-    -717,  -717,  -717,  -717,   237,  -717,    52,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,   238,   239,  -717,  -717,  -717,  -717,
-    -717,   248,   250,   256,   274,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,   293,  -717,  -717,  -717,    64,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,   304,
-      68,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,   305,   321,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,   115,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,   122,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,   330,   337,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,   335,  -717,
-    -717,   340,  -717,  -717,  -717,   342,  -717,  -717,   341,   345,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,   350,   353,  -717,  -717,  -717,  -717,   351,
-     355,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,   123,  -717,  -717,  -717,   356,  -717,  -717,   357,  -717,
-     358,   359,  -717,  -717,   360,   361,   362,  -717,  -717,  -717,
-     167,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,    18,    18,  -717,
-     221,   365,   366,   367,   371,   372,  -717,     4,  -717,   388,
-     257,   258,   402,   405,   406,   407,   408,   265,   266,   267,
-     268,   413,   414,   415,   416,   417,   419,   420,   421,   422,
-     423,   280,   425,   426,   134,  -717,   427,   428,   429,   286,
-      94,  -717,    34,   430,   431,   433,   434,   435,   436,   437,
-     294,   296,   439,   440,   441,   443,    26,  -717,   444,    83,
-    -717,   445,   446,   447,   448,   449,   450,   451,   452,  -717,
-     164,  -717,   453,   455,   313,   456,   458,   459,   314,  -717,
-     142,   463,   318,   319,  -717,   220,   466,   467,    73,  -717,
-     324,   472,   473,   332,   474,   333,   334,   475,   479,   338,
-     339,   344,   480,   481,   275,  -717,  -717,  -717,   483,   484,
-     485,    18,    18,    18,  -717,   488,  -717,  -717,   349,   352,
-     354,   491,   493,  -717,  -717,  -717,  -717,   497,   498,   499,
-     500,   501,    18,   502,   505,   506,   507,  -717,   508,   509,
-    -717,   512,    30,   165,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,   504,   503,  -717,  -717,  -717,   373,
-     374,   375,   513,   376,   377,   378,  -717,  -717,    43,   379,
-     514,   520,  -717,   381,  -717,   512,   384,   385,   386,   389,
-     390,   391,   392,  -717,   393,   394,  -717,   395,   396,   397,
-    -717,  -717,   398,  -717,  -717,  -717,   399,    18,  -717,  -717,
-     400,   401,  -717,   403,  -717,  -717,     3,   438,  -717,  -717,
-    -717,   -68,   404,  -717,    18,   134,   411,  -717,  -717,  -717,
-      94,  -717,  -717,  -717,   230,   230,   542,   545,   546,   547,
-    -717,  -717,  -717,   146,    36,   548,   124,   112,   275,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,   553,  -717,    34,
-    -717,  -717,  -717,   551,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,   552,   476,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,   253,  -717,   276,  -717,
-    -717,   277,  -717,  -717,  -717,  -717,   556,   557,   558,   560,
-     561,  -717,  -717,  -717,   284,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,   285,  -717,
-     562,   510,  -717,  -717,   563,   564,  -717,  -717,   565,   567,
-    -717,  -717,   566,   570,  -717,  -717,  -717,  -717,  -717,  -717,
-     147,  -717,  -717,  -717,  -717,  -717,  -717,  -717,   168,  -717,
-     568,   572,  -717,   573,   574,   575,   576,   577,   578,   288,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,   291,
-    -717,  -717,  -717,   292,   442,   454,  -717,  -717,   579,   580,
-    -717,  -717,   581,   583,  -717,  -717,   582,  -717,   584,   411,
-    -717,  -717,   587,   588,   589,   590,   418,   457,   460,   461,
-     462,   591,   592,   230,  -717,  -717,    26,  -717,   542,   142,
-    -717,   545,   220,  -717,   546,    57,  -717,   547,   146,  -717,
-      36,  -717,   -28,  -717,   548,   464,   465,   468,   469,   470,
-     471,   124,  -717,   593,   594,   112,  -717,  -717,  -717,   596,
-     597,  -717,    83,  -717,   551,   164,  -717,   552,   595,  -717,
-     571,  -717,   161,   477,   478,   482,  -717,  -717,  -717,  -717,
-    -717,   486,   487,  -717,   295,  -717,   598,  -717,   601,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-     298,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,   302,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,   489,   490,  -717,  -717,   492,   309,  -717,   606,  -717,
-     494,   608,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,    57,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,   208,  -717,  -717,    14,   608,
-    -717,  -717,   599,  -717,  -717,  -717,   312,  -717,  -717,  -717,
-    -717,  -717,   600,   495,   616,    14,  -717,   617,  -717,   511,
-    -717,   614,  -717,  -717,   247,  -717,   108,   614,  -717,  -717,
-     619,   622,   623,   331,  -717,  -717,  -717,  -717,  -717,  -717,
-     624,   496,   517,   521,   108,  -717,   515,  -717,  -717,  -717,
-    -717,  -717
+     281,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,    42,    32,    55,    57,    66,    75,   101,
+     139,   148,   155,   177,   192,   206,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+      32,     4,    10,   143,    35,    36,    76,   178,   125,    11,
+     319,   -22,   299,  -734,   216,   221,   205,   228,   240,  -734,
+    -734,  -734,  -734,  -734,   260,  -734,    37,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,   264,   268,  -734,  -734,  -734,  -734,
+    -734,   280,   285,   291,   309,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,   311,  -734,  -734,  -734,    53,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,   315,
+      69,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,   322,   323,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,    78,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,   109,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,   279,   326,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,   328,  -734,
+    -734,   330,  -734,  -734,  -734,   338,  -734,  -734,   336,   345,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,   351,   352,  -734,  -734,  -734,  -734,   341,
+     356,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,   144,  -734,  -734,  -734,   358,  -734,  -734,
+     359,  -734,   360,   361,  -734,  -734,   362,   364,   365,  -734,
+    -734,  -734,   202,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,    32,
+      32,  -734,   223,   373,   374,   375,   381,   382,  -734,    10,
+    -734,   383,   210,   238,   386,   387,   388,   389,   390,   247,
+     248,   251,   252,   393,   394,   424,   425,   426,   427,   428,
+     429,   430,   431,   288,   433,   434,   143,  -734,   435,   436,
+     437,   292,    35,  -734,   126,   439,   440,   441,   443,   444,
+     445,   446,   303,   304,   448,   449,   451,   452,    36,  -734,
+     453,    76,  -734,   454,   455,   456,   457,   458,   459,   460,
+     461,  -734,   178,  -734,   463,   467,   324,   469,   470,   471,
+     329,  -734,    11,   474,   331,   332,  -734,   319,   476,   479,
+     -57,  -734,   334,   482,   483,   340,   485,   343,   344,   489,
+     491,   346,   348,   349,   496,   498,   299,  -734,  -734,  -734,
+     499,   497,   500,    32,    32,    32,  -734,   501,  -734,  -734,
+     363,   366,   367,   504,   505,  -734,  -734,  -734,  -734,   510,
+     512,   513,   514,   515,    32,   516,   518,   519,   521,  -734,
+     522,   523,  -734,   520,   106,   253,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,   525,   502,
+    -734,  -734,  -734,   379,   384,   391,   529,   392,   396,   397,
+    -734,  -734,    56,   398,   530,   533,  -734,   399,  -734,   520,
+     400,   402,   403,   404,   405,   406,   407,  -734,   408,   409,
+    -734,   410,   411,   412,  -734,  -734,   413,  -734,  -734,  -734,
+     414,    32,  -734,  -734,   415,   416,  -734,   417,  -734,  -734,
+       9,   418,  -734,  -734,  -734,   -27,   419,  -734,    32,   143,
+     447,  -734,  -734,  -734,    35,  -734,  -734,  -734,   242,   242,
+     534,   558,   560,   561,  -734,  -734,  -734,   145,    46,   562,
+     154,   211,   299,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,   566,  -734,   126,  -734,  -734,  -734,   565,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,   567,   450,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+     203,  -734,   212,  -734,  -734,   213,  -734,  -734,  -734,  -734,
+     569,   571,   572,   573,   574,  -734,  -734,  -734,   229,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,   230,  -734,   575,   503,  -734,  -734,   576,   517,
+    -734,  -734,   577,   581,  -734,  -734,   579,   583,  -734,  -734,
+    -734,  -734,  -734,  -734,    93,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,   168,  -734,   582,   584,  -734,   585,   586,   587,
+     588,   589,   590,   232,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,   236,  -734,  -734,  -734,   283,   432,   462,
+    -734,  -734,   591,   592,  -734,  -734,   593,   595,  -734,  -734,
+     594,  -734,   596,   447,  -734,  -734,   597,   599,   600,   601,
+     464,   465,   466,   468,   472,   602,   603,   242,  -734,  -734,
+      36,  -734,   534,    11,  -734,   558,   319,  -734,   560,    67,
+    -734,   561,   145,  -734,    46,  -734,   -22,  -734,   562,   473,
+     475,   477,   478,   480,   481,   154,  -734,   604,   606,   211,
+    -734,  -734,  -734,   605,   610,  -734,    76,  -734,   565,   178,
+    -734,   567,   612,  -734,   614,  -734,   167,   484,   486,   487,
+    -734,  -734,  -734,  -734,  -734,   488,   490,  -734,   290,  -734,
+     609,  -734,   616,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,   293,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,   294,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,   492,   493,  -734,  -734,   494,
+     296,  -734,   619,  -734,   495,   615,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,    67,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,   249,
+    -734,  -734,    45,   615,  -734,  -734,   626,  -734,  -734,  -734,
+     300,  -734,  -734,  -734,  -734,  -734,   628,   506,   632,    45,
+    -734,   633,  -734,   508,  -734,   636,  -734,  -734,   250,  -734,
+      30,   636,  -734,  -734,   640,   641,   642,   302,  -734,  -734,
+    -734,  -734,  -734,  -734,   643,   507,   511,   524,    30,  -734,
+     509,  -734,  -734,  -734,  -734,  -734
   };
 
   const unsigned short int
@@ -3613,348 +3613,350 @@ namespace isc { namespace dhcp {
       20,    22,    24,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     1,    41,    34,    30,
       29,    26,    27,    28,    33,     3,    31,    32,    54,     5,
-      66,     7,   110,     9,   222,    11,   373,    13,   396,    15,
-     300,    17,   308,    19,   345,    21,   187,    23,   475,    25,
-      43,    37,     0,     0,     0,     0,     0,   398,     0,   310,
+      66,     7,   110,     9,   222,    11,   375,    13,   398,    15,
+     300,    17,   308,    19,   345,    21,   187,    23,   479,    25,
+      43,    37,     0,     0,     0,     0,     0,   400,     0,   310,
      347,     0,     0,    45,     0,    44,     0,     0,    38,    64,
-     528,   522,   524,   526,     0,    63,     0,    56,    58,    60,
-      61,    62,    59,   102,     0,     0,   415,   417,   419,   123,
-     125,     0,     0,     0,     0,   214,   298,   337,   271,   384,
-     386,   165,   441,   179,   198,     0,   463,   473,    95,     0,
+     532,   526,   528,   530,     0,    63,     0,    56,    58,    60,
+      61,    62,    59,   102,     0,     0,   417,   419,   421,   123,
+     125,     0,     0,     0,     0,   214,   298,   337,   271,   386,
+     388,   165,   443,   179,   198,     0,   467,   477,    95,     0,
       68,    70,    71,    72,    73,    88,    89,    76,    77,    78,
       79,    83,    84,    74,    75,    81,    82,    93,    94,    90,
       91,    92,    80,    85,    86,    87,   112,   114,   118,     0,
-       0,   104,   106,   107,   108,   109,   445,   252,   254,   256,
-     365,   250,   258,   260,     0,     0,   264,   262,   388,   437,
+       0,   104,   106,   107,   108,   109,   447,   252,   254,   256,
+     367,   250,   258,   260,     0,     0,   264,   262,   390,   439,
      249,   226,   227,   228,   240,     0,   224,   231,   244,   245,
      246,   232,   233,   236,   238,   234,   235,   229,   230,   247,
-     248,   237,   241,   242,   243,   239,   382,   381,   378,     0,
-     375,   377,   379,   380,   435,   423,   425,   429,   427,   433,
-     431,   421,   414,   410,     0,   399,   400,   411,   412,   413,
-     407,   402,   408,   404,   405,   406,   409,   403,     0,   327,
+     248,   237,   241,   242,   243,   239,   384,   383,   380,     0,
+     377,   379,   381,   382,   437,   425,   427,   431,   429,   435,
+     433,   423,   416,   412,     0,   401,   402,   413,   414,   415,
+     409,   404,   410,   406,   407,   408,   411,   405,     0,   327,
      155,     0,   331,   329,   334,     0,   323,   324,     0,   311,
      312,   314,   326,   315,   316,   317,   333,   318,   319,   320,
-     321,   322,   359,     0,     0,   357,   358,   361,   362,     0,
-     348,   349,   351,   352,   353,   354,   355,   356,   194,   196,
-     191,     0,   189,   192,   193,     0,   495,   497,     0,   500,
-       0,     0,   504,   508,     0,     0,     0,   513,   520,   493,
-       0,   477,   479,   480,   481,   482,   483,   484,   485,   486,
-     487,   488,   489,   490,   491,   492,    42,     0,     0,    35,
-       0,     0,     0,     0,     0,     0,    53,     0,    55,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    67,     0,     0,     0,     0,
-       0,   111,   447,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   223,     0,     0,
-     374,     0,     0,     0,     0,     0,     0,     0,     0,   397,
-       0,   301,     0,     0,     0,     0,     0,     0,     0,   309,
-       0,     0,     0,     0,   346,     0,     0,     0,     0,   188,
+     321,   322,   361,     0,     0,   359,   360,   363,   364,     0,
+     348,   349,   351,   352,   353,   354,   355,   356,   357,   358,
+     194,   196,   191,     0,   189,   192,   193,     0,   499,   501,
+       0,   504,     0,     0,   508,   512,     0,     0,     0,   517,
+     524,   497,     0,   481,   483,   484,   485,   486,   487,   488,
+     489,   490,   491,   492,   493,   494,   495,   496,    42,     0,
+       0,    35,     0,     0,     0,     0,     0,     0,    53,     0,
+      55,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   476,    46,    39,     0,     0,
-       0,     0,     0,     0,    57,     0,   100,   101,     0,     0,
-       0,     0,     0,    96,    97,    98,    99,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   462,     0,     0,
-      69,     0,     0,     0,   122,   105,   460,   458,   459,   453,
-     454,   455,   456,   457,     0,   448,   449,   451,   452,     0,
-       0,     0,     0,     0,     0,     0,   269,   270,     0,     0,
-       0,     0,   225,     0,   376,     0,     0,     0,     0,     0,
-       0,     0,     0,   401,     0,     0,   325,     0,     0,     0,
-     336,   313,     0,   363,   364,   350,     0,     0,   190,   494,
-       0,     0,   499,     0,   502,   503,     0,     0,   510,   511,
-     512,     0,     0,   478,     0,     0,     0,   523,   525,   527,
-       0,   416,   418,   420,     0,     0,   216,   302,   339,   273,
-      36,   385,   387,     0,     0,   181,     0,     0,     0,    47,
-     113,   116,   117,   115,   120,   121,   119,     0,   446,     0,
-     253,   255,   257,   367,   251,   259,   261,   266,   267,   268,
-     265,   263,   390,     0,   383,   436,   424,   426,   430,   428,
-     434,   432,   422,   328,   156,   332,   330,   335,   360,   195,
-     197,   496,   498,   501,   506,   507,   505,   509,   515,   516,
-     517,   518,   519,   514,   521,    40,     0,   533,     0,   530,
-     532,     0,   142,   148,   150,   152,     0,     0,     0,     0,
-       0,   161,   163,   141,     0,   127,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   139,   140,     0,   220,
-       0,   217,   218,   306,     0,   303,   304,   343,     0,   340,
-     341,   277,     0,   274,   275,   174,   175,   176,   177,   178,
-       0,   167,   169,   170,   171,   172,   173,   443,     0,   185,
-       0,   182,   183,     0,     0,     0,     0,     0,     0,     0,
-     200,   202,   203,   204,   205,   206,   207,   469,   471,     0,
-     465,   467,   468,     0,    49,     0,   450,   371,     0,   368,
-     369,   394,     0,   391,   392,   439,     0,    65,     0,     0,
-     529,   103,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   124,   126,     0,   215,     0,   310,
-     299,     0,   347,   338,     0,     0,   272,     0,     0,   166,
-       0,   442,     0,   180,     0,     0,     0,     0,     0,     0,
-       0,     0,   199,     0,     0,     0,   464,   474,    51,     0,
-      50,   461,     0,   366,     0,   398,   389,     0,     0,   438,
-       0,   531,     0,     0,     0,     0,   154,   157,   158,   159,
-     160,     0,     0,   128,     0,   219,     0,   305,     0,   342,
-     297,   294,   284,   285,   287,   281,   282,   283,   293,   292,
-       0,   279,   286,   295,   296,   288,   289,   290,   291,   276,
-     168,   444,     0,   184,   208,   209,   210,   211,   212,   213,
-     201,     0,     0,   466,    48,     0,     0,   370,     0,   393,
-       0,     0,   144,   145,   146,   147,   143,   149,   151,   153,
-     162,   164,   221,   307,   344,     0,   278,   186,   470,   472,
-      52,   372,   395,   440,   537,     0,   535,   280,     0,     0,
-     534,   549,     0,   547,   545,   541,     0,   539,   543,   544,
-     542,   536,     0,     0,     0,     0,   538,     0,   546,     0,
-     540,     0,   548,   553,     0,   551,     0,     0,   550,   561,
-       0,     0,     0,     0,   555,   557,   558,   559,   560,   552,
-       0,     0,     0,     0,     0,   554,     0,   563,   564,   565,
-     556,   562
+       0,     0,     0,     0,     0,     0,     0,    67,     0,     0,
+       0,     0,     0,   111,   449,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   223,
+       0,     0,   376,     0,     0,     0,     0,     0,     0,     0,
+       0,   399,     0,   301,     0,     0,     0,     0,     0,     0,
+       0,   309,     0,     0,     0,     0,   346,     0,     0,     0,
+       0,   188,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   480,    46,    39,
+       0,     0,     0,     0,     0,     0,    57,     0,   100,   101,
+       0,     0,     0,     0,     0,    96,    97,    98,    99,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   466,
+       0,     0,    69,     0,     0,     0,   122,   105,   464,   462,
+     463,   455,   456,   460,   461,   457,   458,   459,     0,   450,
+     451,   453,   454,     0,     0,     0,     0,     0,     0,     0,
+     269,   270,     0,     0,     0,     0,   225,     0,   378,     0,
+       0,     0,     0,     0,     0,     0,     0,   403,     0,     0,
+     325,     0,     0,     0,   336,   313,     0,   365,   366,   350,
+       0,     0,   190,   498,     0,     0,   503,     0,   506,   507,
+       0,     0,   514,   515,   516,     0,     0,   482,     0,     0,
+       0,   527,   529,   531,     0,   418,   420,   422,     0,     0,
+     216,   302,   339,   273,    36,   387,   389,     0,     0,   181,
+       0,     0,     0,    47,   113,   116,   117,   115,   120,   121,
+     119,     0,   448,     0,   253,   255,   257,   369,   251,   259,
+     261,   266,   267,   268,   265,   263,   392,     0,   385,   438,
+     426,   428,   432,   430,   436,   434,   424,   328,   156,   332,
+     330,   335,   362,   195,   197,   500,   502,   505,   510,   511,
+     509,   513,   519,   520,   521,   522,   523,   518,   525,    40,
+       0,   537,     0,   534,   536,     0,   142,   148,   150,   152,
+       0,     0,     0,     0,     0,   161,   163,   141,     0,   127,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,   140,     0,   220,     0,   217,   218,   306,     0,   303,
+     304,   343,     0,   340,   341,   277,     0,   274,   275,   174,
+     175,   176,   177,   178,     0,   167,   169,   170,   171,   172,
+     173,   445,     0,   185,     0,   182,   183,     0,     0,     0,
+       0,     0,     0,     0,   200,   202,   203,   204,   205,   206,
+     207,   473,   475,     0,   469,   471,   472,     0,    49,     0,
+     452,   373,     0,   370,   371,   396,     0,   393,   394,   441,
+       0,    65,     0,     0,   533,   103,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   124,   126,
+       0,   215,     0,   310,   299,     0,   347,   338,     0,     0,
+     272,     0,     0,   166,     0,   444,     0,   180,     0,     0,
+       0,     0,     0,     0,     0,     0,   199,     0,     0,     0,
+     468,   478,    51,     0,    50,   465,     0,   368,     0,   400,
+     391,     0,     0,   440,     0,   535,     0,     0,     0,     0,
+     154,   157,   158,   159,   160,     0,     0,   128,     0,   219,
+       0,   305,     0,   342,   297,   294,   284,   285,   287,   281,
+     282,   283,   293,   292,     0,   279,   286,   295,   296,   288,
+     289,   290,   291,   276,   168,   446,     0,   184,   208,   209,
+     210,   211,   212,   213,   201,     0,     0,   470,    48,     0,
+       0,   372,     0,   395,     0,     0,   144,   145,   146,   147,
+     143,   149,   151,   153,   162,   164,   221,   307,   344,     0,
+     278,   186,   474,   476,    52,   374,   397,   442,   541,     0,
+     539,   280,     0,     0,   538,   553,     0,   551,   549,   545,
+       0,   543,   547,   548,   546,   540,     0,     0,     0,     0,
+     542,     0,   550,     0,   544,     0,   552,   557,     0,   555,
+       0,     0,   554,   565,     0,     0,     0,     0,   559,   561,
+     562,   563,   564,   556,     0,     0,     0,     0,     0,   558,
+       0,   567,   568,   569,   560,   566
   };
 
   const short int
   Dhcp4Parser::yypgoto_[] =
   {
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,   -49,  -717,   189,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,    99,  -717,  -717,  -717,   -62,
-    -717,  -717,  -717,   315,  -717,  -717,  -717,  -717,   106,   261,
-     -52,   -31,   -24,  -717,  -717,   -19,  -717,  -717,   105,   290,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,   103,   -81,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,   -69,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-     -94,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-     -99,  -717,  -717,  -717,   -95,   251,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -103,  -717,  -717,  -717,  -717,  -717,  -717,
-    -716,  -717,  -717,  -717,   -78,  -717,  -717,  -717,   -75,   287,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -713,  -717,
-    -717,  -717,  -532,  -717,  -705,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,   -85,  -717,  -717,  -190,   -66,  -717,  -717,
-    -717,  -717,  -717,   -74,  -717,  -717,  -717,   -73,  -717,   269,
-    -717,   -64,  -717,  -717,  -717,  -717,  -717,   -39,  -717,  -717,
-    -717,  -717,  -717,   -50,  -717,  -717,  -717,   -63,  -717,  -717,
-    -717,   -72,  -717,   282,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,   -92,  -717,  -717,  -717,   -87,
-     310,  -717,  -717,   -45,  -717,   -37,  -717,  -717,  -717,  -717,
-    -717,   -89,  -717,  -717,  -717,   -83,  -717,   306,   -30,  -717,
-     -29,  -717,   -25,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -696,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-     128,  -717,  -717,  -717,  -717,  -717,  -717,  -717,   -67,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,   151,   299,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,  -717,
-    -717,   -18,  -717,  -717,  -717,  -165,  -717,  -717,  -167,  -717,
-    -717,  -717,  -717,  -717,  -717,  -178,  -717,  -717,  -186,  -717,
-    -717,  -717,  -717,  -717
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,   -43,  -734,   137,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,   107,  -734,  -734,  -734,   -62,
+    -734,  -734,  -734,   333,  -734,  -734,  -734,  -734,   119,   305,
+     -52,   -37,   -16,  -734,  -734,   -10,  -734,  -734,   115,   298,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,   114,   -67,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,   -69,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+     -81,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+     -86,  -734,  -734,  -734,   -83,   266,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,   -91,  -734,  -734,  -734,  -734,  -734,  -734,
+    -733,  -734,  -734,  -734,   -63,  -734,  -734,  -734,   -55,   313,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -714,  -734,
+    -734,  -734,  -527,  -734,  -713,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,   -68,  -734,  -734,  -161,   -66,  -734,  -734,
+    -734,  -734,  -734,   -45,  -734,  -734,  -734,   -42,  -734,   306,
+    -734,   -56,  -734,  -734,  -734,  -734,  -734,   -40,  -734,  -734,
+    -734,  -734,  -734,   -31,  -734,  -734,  -734,   -41,  -734,  -734,
+    -734,   -35,  -734,   308,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,   -73,  -734,  -734,  -734,   -60,
+     339,  -734,  -734,   -54,  -734,   -47,  -734,  -734,  -734,  -734,
+    -734,   -71,  -734,  -734,  -734,   -58,  -734,   335,   -36,  -734,
+     -21,  -734,   -15,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -712,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+     150,  -734,  -734,  -734,  -734,  -734,  -734,  -734,   -38,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,   164,   310,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,  -734,
+    -734,    12,  -734,  -734,  -734,  -141,  -734,  -734,  -152,  -734,
+    -734,  -734,  -734,  -734,  -734,  -163,  -734,  -734,  -178,  -734,
+    -734,  -734,  -734,  -734
   };
 
   const short int
   Dhcp4Parser::yydefgoto_[] =
   {
       -1,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    34,    35,    36,    61,   541,    77,
-      78,    37,    60,    74,    75,   550,   694,   759,   760,   118,
-      39,    62,    86,    87,    88,   311,    41,    63,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   319,   150,   151,
-      43,    64,   152,   346,   153,   347,   553,   154,   348,   556,
-     155,   128,   325,   129,   326,   624,   625,   626,   712,   836,
-     627,   713,   628,   714,   629,   715,   630,   237,   383,   632,
-     633,   634,   635,   636,   721,   637,   722,   130,   337,   660,
-     661,   662,   663,   664,   665,   666,   131,   339,   670,   671,
-     672,   742,    57,    71,   271,   272,   273,   396,   274,   397,
-     132,   340,   679,   680,   681,   682,   683,   684,   685,   686,
-     133,   331,   640,   641,   642,   726,    45,    65,   175,   176,
-     177,   357,   178,   353,   179,   354,   180,   355,   181,   358,
-     182,   359,   183,   363,   184,   362,   570,   185,   186,   134,
-     334,   652,   653,   654,   735,   800,   801,   135,   332,    51,
-      68,   644,   645,   646,   729,    53,    69,   238,   239,   240,
-     241,   242,   243,   244,   382,   245,   386,   246,   385,   247,
-     248,   387,   249,   136,   333,   648,   649,   650,   732,    55,
-      70,   259,   260,   261,   262,   263,   391,   264,   265,   266,
-     267,   188,   356,   698,   699,   700,   762,    47,    66,   199,
-     200,   201,   368,   137,   335,   138,   336,   191,   364,   702,
-     703,   704,   765,    49,    67,   214,   215,   216,   139,   322,
-     140,   323,   141,   324,   220,   378,   221,   372,   222,   373,
-     223,   375,   224,   374,   225,   377,   226,   376,   227,   371,
-     195,   365,   706,   768,   142,   338,   668,   352,   464,   465,
-     466,   467,   468,   557,   143,   144,   342,   689,   690,   691,
-     753,   692,   754,   145,   343,    59,    72,   290,   291,   292,
-     293,   401,   294,   402,   295,   296,   404,   297,   298,   299,
-     407,   596,   300,   408,   301,   302,   303,   304,   412,   603,
-     305,   413,    89,   313,    90,   314,    91,   315,    92,   312,
-     608,   609,   610,   708,   855,   856,   858,   866,   867,   868,
-     869,   874,   870,   872,   884,   885,   886,   893,   894,   895,
-     900,   896,   897,   898
+      22,    23,    24,    25,    34,    35,    36,    61,   545,    77,
+      78,    37,    60,    74,    75,   554,   698,   763,   764,   118,
+      39,    62,    86,    87,    88,   313,    41,    63,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   321,   150,   151,
+      43,    64,   152,   348,   153,   349,   557,   154,   350,   560,
+     155,   128,   327,   129,   328,   628,   629,   630,   716,   840,
+     631,   717,   632,   718,   633,   719,   634,   237,   385,   636,
+     637,   638,   639,   640,   725,   641,   726,   130,   339,   664,
+     665,   666,   667,   668,   669,   670,   131,   341,   674,   675,
+     676,   746,    57,    71,   273,   274,   275,   398,   276,   399,
+     132,   342,   683,   684,   685,   686,   687,   688,   689,   690,
+     133,   333,   644,   645,   646,   730,    45,    65,   175,   176,
+     177,   359,   178,   355,   179,   356,   180,   357,   181,   360,
+     182,   361,   183,   365,   184,   364,   574,   185,   186,   134,
+     336,   656,   657,   658,   739,   804,   805,   135,   334,    51,
+      68,   648,   649,   650,   733,    53,    69,   238,   239,   240,
+     241,   242,   243,   244,   384,   245,   388,   246,   387,   247,
+     248,   389,   249,   136,   335,   652,   653,   654,   736,    55,
+      70,   259,   260,   261,   262,   263,   393,   264,   265,   266,
+     267,   188,   358,   702,   703,   704,   766,    47,    66,   199,
+     200,   201,   370,   137,   337,   138,   338,   191,   366,   706,
+     707,   708,   769,    49,    67,   214,   215,   216,   139,   324,
+     140,   325,   141,   326,   220,   380,   221,   374,   222,   375,
+     223,   377,   224,   376,   225,   379,   226,   378,   227,   373,
+     195,   367,   710,   772,   142,   340,   672,   354,   468,   469,
+     470,   471,   472,   561,   143,   144,   344,   693,   694,   695,
+     757,   696,   758,   145,   345,    59,    72,   292,   293,   294,
+     295,   403,   296,   404,   297,   298,   406,   299,   300,   301,
+     409,   600,   302,   410,   303,   304,   305,   306,   414,   607,
+     307,   415,    89,   315,    90,   316,    91,   317,    92,   314,
+     612,   613,   614,   712,   859,   860,   862,   870,   871,   872,
+     873,   878,   874,   876,   888,   889,   890,   897,   898,   899,
+     904,   900,   901,   902
   };
 
   const unsigned short int
   Dhcp4Parser::yytable_[] =
   {
-      85,   256,   228,   170,   197,   212,   257,   236,   255,   270,
-     289,    73,   667,   171,    79,   187,   198,   213,   594,   796,
-     189,   202,   797,    27,   250,    28,    38,    29,   190,   203,
-     799,   258,   251,   156,   172,   192,   193,   217,   218,   808,
-     194,   173,   219,   156,   551,   552,   174,    95,    96,    97,
-      98,   598,   599,   600,   601,   317,    96,    97,    98,    26,
-     318,   268,   269,    40,   156,    42,   230,   344,   101,   102,
-     103,   350,   345,   157,   158,   159,   351,   107,    95,    96,
-      97,    98,   602,    44,   106,   107,   230,    46,   160,    48,
-     109,   110,   161,   162,   163,   164,   165,   166,    50,   101,
-     102,   103,    52,   105,   167,   168,   146,   147,   107,   230,
-     148,   456,   169,   149,   167,   567,   568,   569,   366,    84,
-     595,   109,   110,   367,   162,   369,   398,    80,   166,   796,
-     370,   399,   797,    54,   107,   167,    81,    82,    83,   861,
-     799,   862,   863,   169,    56,    93,   196,   109,   110,   808,
-     738,    84,    58,   739,    94,    95,    96,    97,    98,    99,
-     100,    84,   268,   269,    76,    30,    31,    32,    33,   229,
-     414,   740,   306,    84,   741,   415,   101,   102,   103,   104,
-     105,    84,   554,   555,   106,   107,    96,    97,    98,   832,
-     833,   834,   835,   106,   230,   108,   231,   232,   109,   110,
-     233,   234,   235,   798,    84,   307,   109,   110,   811,   111,
-     112,   859,   687,   688,   860,   107,   673,   674,   675,   676,
-     677,   678,   113,   308,   309,   114,   655,   656,   657,   658,
-      84,   659,   115,   116,   889,   310,   117,   890,   891,   892,
-     204,   316,   320,   321,   205,   206,   207,   208,   209,   210,
-     887,   211,   327,   888,   328,    85,   344,   612,   416,   417,
-     329,   707,   613,   614,   615,   616,   617,   618,   619,   620,
-     621,   622,   230,   252,   231,   232,   253,   254,   330,   709,
-     350,    84,   230,   458,   710,   711,   459,   723,   723,    84,
-     457,   751,   724,   725,   755,   414,   752,   341,   366,   756,
-     757,   845,   460,   842,   170,   398,   846,   197,   349,   360,
-     847,    84,   369,   798,   171,   875,   187,   851,   212,   198,
-     876,   189,   461,   462,   202,   361,   256,   463,   236,   190,
-     213,   257,   203,   255,   904,   172,   192,   193,   379,   905,
-     380,   194,   173,   381,   384,   250,   388,   174,   390,   389,
-     217,   218,   289,   251,   392,   219,   258,   393,   395,   394,
-     400,   403,   405,   406,   409,   410,   411,    84,   418,   419,
-     420,   421,   527,   528,   529,   422,   423,    84,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   425,   542,     1,     2,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,   428,   426,   427,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,    84,   442,   443,   444,   445,   446,   447,   448,
-     449,   451,   452,   453,   469,   470,   454,   471,   472,   473,
-     474,   475,   476,   478,   479,   480,   477,   481,   483,   485,
-     486,   487,   488,   489,   490,   491,   492,   494,   590,   495,
-     497,   496,   498,   499,   500,   631,   631,   502,   503,   504,
-     506,   507,   623,   623,   509,   605,   510,   511,   513,   516,
-     512,   514,   515,   517,   521,   522,   289,   524,   518,   519,
-     458,   525,   526,   459,   520,   530,   531,   457,   534,   532,
-     535,   533,   536,   537,   538,   539,   559,   543,    28,   460,
-     544,   545,   558,   728,   546,   547,   548,   549,   563,   572,
-     560,   561,   562,   564,   565,   566,   571,   573,   574,   461,
-     462,   576,   577,   578,   463,   607,   579,   580,   581,   582,
-     583,   584,   585,   586,   587,   588,   589,   591,   592,   639,
-     593,   604,   643,   647,   651,   669,   597,   695,   697,   701,
-     716,   717,   718,   705,   719,   720,   776,   731,   727,   730,
-     734,   733,   736,   737,   743,   744,   831,   745,   746,   747,
-     748,   749,   750,   764,   575,   763,   767,   766,   770,   758,
-     769,   772,   773,   774,   775,   781,   782,   821,   822,   830,
-     825,   761,   824,   873,   877,   450,   843,   777,   778,   844,
-     780,   779,   814,   815,   852,   854,   816,   817,   818,   819,
-     879,   883,   881,   901,   837,   838,   902,   903,   906,   839,
-     540,   606,   424,   840,   841,   611,   848,   849,   638,   850,
-     455,   853,   783,   878,   810,   813,   907,   812,   820,   508,
-     785,   784,   809,   482,   631,   857,   786,   787,   882,   501,
-     788,   623,   911,   256,   170,   908,   795,   236,   257,   909,
-     255,   789,   827,   790,   171,   826,   187,   505,   829,   484,
-     270,   189,   828,   791,   250,   802,   493,   696,   823,   190,
-     803,   771,   251,   258,   871,   172,   192,   193,   804,   693,
-     197,   194,   173,   212,   792,   805,   806,   174,   880,   899,
-     807,   793,   198,   523,     0,   213,   794,   202,   910,     0,
-       0,     0,     0,     0,     0,   203,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   217,   218,     0,     0,     0,
-     219,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      85,   256,   228,   170,   197,   212,   800,   236,   255,   272,
+     291,   189,   202,   171,   257,   250,   268,    73,   190,   203,
+      79,   671,   251,   269,   598,   801,   803,   812,   172,   192,
+     258,   217,   270,   271,   187,   198,   213,    27,   229,    28,
+     319,    29,    26,   156,   193,   320,   218,   146,   147,   173,
+     194,   148,   219,   156,   149,   174,   346,    95,    96,    97,
+      98,   347,    38,   230,    40,   231,   232,   270,   271,   233,
+     234,   235,   352,    42,   156,   109,   110,   353,   101,   102,
+     103,   368,    44,   157,   158,   159,   369,   107,    95,    96,
+      97,    98,   602,   603,   604,   605,   742,   230,   160,   743,
+     109,   110,   161,   162,   163,   164,   165,   166,    46,   101,
+     102,   103,   371,   105,   167,   168,   800,   372,   107,   230,
+     555,   556,   169,   606,   167,    84,   599,   107,   571,   572,
+     573,   109,   110,    80,   162,   801,   803,   812,   166,   196,
+     109,   110,    81,    82,    83,   167,    48,   400,    96,    97,
+      98,    76,   401,   169,    93,    50,   893,    84,    84,   894,
+     895,   896,    52,    94,    95,    96,    97,    98,    99,   100,
+     865,   744,   866,   867,   745,   106,   106,   107,   230,    30,
+      31,    32,    33,    84,    54,   101,   102,   103,   104,   105,
+     109,   110,    84,   106,   107,   836,   837,   838,   839,    56,
+      96,    97,    98,   458,   108,   416,   346,   109,   110,   310,
+     417,   711,   802,    58,    84,   713,   352,   815,   111,   112,
+     714,   715,   308,    84,   309,   659,   660,   661,   662,   107,
+     663,   113,   727,   727,   114,   755,   311,   728,   729,   759,
+     756,   115,   116,   312,   760,   117,   677,   678,   679,   680,
+     681,   682,   863,   891,   204,   864,   892,    85,   205,   206,
+     207,   208,   209,   210,   318,   211,   418,   419,   322,   616,
+     558,   559,   323,    84,   617,   618,   619,   620,   621,   622,
+     623,   624,   625,   626,   329,   460,   416,   381,   461,   330,
+      84,   761,   459,   368,   230,   331,   849,   400,   846,   371,
+     463,   850,   851,   879,   855,   908,   170,   464,   880,   197,
+     909,   691,   692,   332,   189,   343,   171,   202,   465,   351,
+     212,   190,   802,   462,   203,    84,   362,   363,   256,   382,
+     236,   172,   192,   466,   386,   255,   383,   187,   250,   467,
+     198,   257,   390,   268,   391,   251,   217,   193,   392,   396,
+     269,   213,   173,   194,   291,   394,   395,   258,   174,   397,
+     428,   218,   402,   405,   407,   408,   411,   219,   412,   413,
+     420,   230,   252,   231,   232,   253,   254,   421,   422,   423,
+     531,   532,   533,   109,   110,   424,   425,   427,   429,    84,
+     430,   431,   432,   433,   434,   435,   436,   439,   440,   437,
+     438,   546,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,   441,   442,
+     443,   444,   445,   446,   447,   448,   449,   450,   451,   453,
+     454,   455,   456,   473,   474,   475,    84,   476,   477,   478,
+     479,   480,   482,   483,   481,   484,   485,   487,   489,   490,
+     491,   492,   493,   494,   495,   496,    84,   498,   594,   635,
+     635,   499,   500,   501,   502,   503,   627,   627,   506,   504,
+     510,   507,   508,   511,   513,   609,   514,   515,   516,   517,
+     291,   518,   519,   520,   460,   521,   522,   461,   523,   524,
+     525,   459,   526,   528,   529,   563,   732,   530,   534,   463,
+     535,   538,   539,   536,   537,   540,   464,   541,   542,   543,
+     735,   547,    28,   548,   549,   553,   564,   465,   550,   551,
+     552,   565,   462,   562,   567,   576,   601,   709,   566,   568,
+     577,   643,   466,   569,   570,   575,   578,   580,   467,   581,
+     582,   583,   584,   585,   586,   587,   588,   589,   590,   591,
+     592,   593,   595,   596,   597,   647,   608,   651,   655,   673,
+     699,   611,   701,   720,   705,   721,   722,   723,   724,   762,
+     544,   731,   734,   737,   738,   740,   741,   748,   747,   749,
+     750,   751,   752,   753,   754,   768,   579,   767,   771,   770,
+     774,   776,   773,   777,   778,   779,   785,   786,   825,   765,
+     826,   828,   780,   829,   782,   781,   834,   847,   783,   835,
+     784,   818,   858,   819,   848,   820,   821,   856,   822,   823,
+     877,   841,   881,   842,   843,   844,   883,   845,   885,   852,
+     853,   854,   857,   887,   905,   906,   907,   910,   610,   615,
+     457,   452,   426,   642,   882,   886,   915,   911,   635,   912,
+     787,   814,   817,   816,   824,   627,   512,   256,   170,   789,
+     799,   236,   913,   813,   255,   788,   189,   794,   171,   250,
+     257,   486,   268,   190,   272,   807,   251,   795,   861,   269,
+     791,   790,   808,   172,   192,   831,   258,   793,   505,   187,
+     833,   792,   796,   809,   197,   509,   830,   212,   806,   193,
+     488,   832,   202,   700,   173,   194,   697,   497,   810,   203,
+     174,   827,   875,   797,   811,   775,   527,   884,   903,   798,
+     914,     0,     0,   217,     0,   198,     0,     0,   213,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   218,     0,
+       0,     0,     0,     0,   219,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   795,     0,     0,     0,
-       0,     0,     0,   790,     0,     0,     0,     0,     0,   865,
-       0,     0,     0,   791,     0,   802,   864,     0,     0,     0,
-     803,     0,     0,     0,     0,     0,   865,     0,   804,     0,
-       0,     0,     0,   864,   792,   805,   806,     0,     0,     0,
-     807,   793,     0,     0,     0,     0,   794
+     799,     0,     0,     0,     0,     0,     0,   794,     0,     0,
+       0,     0,     0,   869,     0,   807,     0,   795,     0,     0,
+     868,     0,   808,     0,     0,     0,     0,     0,     0,     0,
+     869,     0,   796,   809,     0,     0,     0,   868,   806,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   810,     0,
+       0,     0,     0,   797,   811,     0,     0,     0,     0,   798
   };
 
   const short int
   Dhcp4Parser::yycheck_[] =
   {
-      62,    70,    68,    65,    66,    67,    70,    69,    70,    71,
-      72,    60,   544,    65,    10,    65,    66,    67,    15,   735,
-      65,    66,   735,     5,    69,     7,     7,     9,    65,    66,
-     735,    70,    69,     7,    65,    65,    65,    67,    67,   735,
-      65,    65,    67,     7,    14,    15,    65,    21,    22,    23,
-      24,   119,   120,   121,   122,     3,    22,    23,    24,     0,
-       8,    89,    90,     7,     7,     7,    52,     3,    42,    43,
-      44,     3,     8,    47,    48,    49,     8,    51,    21,    22,
-      23,    24,   150,     7,    50,    51,    52,     7,    62,     7,
+      62,    70,    68,    65,    66,    67,   739,    69,    70,    71,
+      72,    65,    66,    65,    70,    69,    70,    60,    65,    66,
+      10,   548,    69,    70,    15,   739,   739,   739,    65,    65,
+      70,    67,    89,    90,    65,    66,    67,     5,    27,     7,
+       3,     9,     0,     7,    65,     8,    67,    12,    13,    65,
+      65,    16,    67,     7,    19,    65,     3,    21,    22,    23,
+      24,     8,     7,    52,     7,    54,    55,    89,    90,    58,
+      59,    60,     3,     7,     7,    64,    65,     8,    42,    43,
+      44,     3,     7,    47,    48,    49,     8,    51,    21,    22,
+      23,    24,   119,   120,   121,   122,     3,    52,    62,     6,
       64,    65,    66,    67,    68,    69,    70,    71,     7,    42,
-      43,    44,     7,    46,    78,    79,    12,    13,    51,    52,
-      16,    77,    86,    19,    78,    72,    73,    74,     3,   147,
-     117,    64,    65,     8,    67,     3,     3,   123,    71,   845,
-       8,     8,   845,     7,    51,    78,   132,   133,   134,   125,
-     845,   127,   128,    86,     7,    11,    63,    64,    65,   845,
-       3,   147,     7,     6,    20,    21,    22,    23,    24,    25,
-      26,   147,    89,    90,   147,   147,   148,   149,   150,    27,
-       3,     3,     6,   147,     6,     8,    42,    43,    44,    45,
-      46,   147,    17,    18,    50,    51,    22,    23,    24,    28,
-      29,    30,    31,    50,    52,    61,    54,    55,    64,    65,
-      58,    59,    60,   735,   147,     3,    64,    65,   740,    75,
-      76,     3,   100,   101,     6,    51,    92,    93,    94,    95,
-      96,    97,    88,     4,     8,    91,    80,    81,    82,    83,
-     147,    85,    98,    99,   126,     3,   102,   129,   130,   131,
-      76,     4,     4,     4,    80,    81,    82,    83,    84,    85,
-       3,    87,     4,     6,     4,   317,     3,    27,   307,   308,
-       4,     8,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    52,    53,    54,    55,    56,    57,     4,     3,
-       3,   147,    52,   352,     8,     8,   352,     3,     3,   147,
-     352,     3,     8,     8,     3,     3,     8,     4,     3,     8,
-       8,     3,   352,     8,   366,     3,     8,   369,     4,     4,
-       8,   147,     3,   845,   366,     3,   366,     8,   380,   369,
-       8,   366,   352,   352,   369,     4,   395,   352,   390,   366,
-     380,   395,   369,   395,     3,   366,   366,   366,     8,     8,
-       3,   366,   366,     8,     4,   390,     4,   366,     3,     8,
-     380,   380,   414,   390,     4,   380,   395,     4,     3,     8,
-       4,     4,     4,     4,     4,     4,     4,   147,   147,     4,
-       4,     4,   421,   422,   423,     4,     4,   147,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,     4,   442,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,     4,   150,   150,     4,
-       4,     4,     4,   148,   148,   148,   148,     4,     4,     4,
-       4,     4,   147,     4,     4,     4,     4,     4,   148,     4,
-       4,     4,     4,     4,     4,     4,   150,     4,     4,     4,
-       4,     4,   148,     4,     4,     4,   150,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,   507,     4,
-       4,   148,     4,     4,   150,   534,   535,     4,   150,   150,
-       4,     4,   534,   535,   150,   524,     4,     4,     4,     4,
-     148,   148,   148,     4,     4,     4,   548,     4,   150,   150,
-     559,     7,     7,   559,   150,     7,   147,   559,     7,   147,
-       7,   147,     5,     5,     5,     5,     3,     5,     7,   559,
-       5,     5,     8,     3,     7,     7,     7,     5,     5,     5,
-     147,   147,   147,   147,   147,   147,   147,     7,   147,   559,
-     559,   147,   147,   147,   559,   124,   147,   147,   147,   147,
-     147,   147,   147,   147,   147,   147,   147,   147,   147,     7,
-     147,   147,     7,     7,     7,     7,   118,     4,     7,     7,
-       4,     4,     4,    87,     4,     4,   148,     3,     6,     6,
-       3,     6,     6,     3,     6,     3,     5,     4,     4,     4,
-       4,     4,     4,     3,   485,     6,     3,     6,     4,   147,
-       8,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       3,   147,     6,     4,     4,   344,     8,   150,   148,     8,
-     148,   150,   148,   148,     8,     7,   148,   148,   148,   148,
-       4,     7,     5,     4,   147,   147,     4,     4,     4,   147,
-     441,   525,   317,   147,   147,   530,   147,   147,   535,   147,
-     350,   147,   723,   148,   738,   744,   150,   742,   751,   398,
-     728,   726,   737,   366,   723,   845,   729,   731,   147,   390,
-     732,   723,   147,   732,   726,   148,   735,   729,   732,   148,
-     732,   734,   764,   735,   726,   762,   726,   395,   767,   369,
-     742,   726,   765,   735,   729,   735,   380,   559,   755,   726,
-     735,   709,   729,   732,   859,   726,   726,   726,   735,   548,
-     762,   726,   726,   765,   735,   735,   735,   726,   875,   887,
-     735,   735,   762,   414,    -1,   765,   735,   762,   904,    -1,
-      -1,    -1,    -1,    -1,    -1,   762,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   765,   765,    -1,    -1,    -1,
-     765,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      43,    44,     3,    46,    78,    79,   849,     8,    51,    52,
+      14,    15,    86,   150,    78,   147,   117,    51,    72,    73,
+      74,    64,    65,   123,    67,   849,   849,   849,    71,    63,
+      64,    65,   132,   133,   134,    78,     7,     3,    22,    23,
+      24,   147,     8,    86,    11,     7,   126,   147,   147,   129,
+     130,   131,     7,    20,    21,    22,    23,    24,    25,    26,
+     125,     3,   127,   128,     6,    50,    50,    51,    52,   147,
+     148,   149,   150,   147,     7,    42,    43,    44,    45,    46,
+      64,    65,   147,    50,    51,    28,    29,    30,    31,     7,
+      22,    23,    24,    77,    61,     3,     3,    64,    65,     4,
+       8,     8,   739,     7,   147,     3,     3,   744,    75,    76,
+       8,     8,     6,   147,     3,    80,    81,    82,    83,    51,
+      85,    88,     3,     3,    91,     3,     8,     8,     8,     3,
+       8,    98,    99,     3,     8,   102,    92,    93,    94,    95,
+      96,    97,     3,     3,    76,     6,     6,   319,    80,    81,
+      82,    83,    84,    85,     4,    87,   309,   310,     4,    27,
+      17,    18,     4,   147,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,     4,   354,     3,     8,   354,     4,
+     147,     8,   354,     3,    52,     4,     3,     3,     8,     3,
+     354,     8,     8,     3,     8,     3,   368,   354,     8,   371,
+       8,   100,   101,     4,   368,     4,   368,   371,   354,     4,
+     382,   368,   849,   354,   371,   147,     4,     4,   397,     3,
+     392,   368,   368,   354,     4,   397,     8,   368,   392,   354,
+     371,   397,     4,   397,     8,   392,   382,   368,     3,     8,
+     397,   382,   368,   368,   416,     4,     4,   397,   368,     3,
+     150,   382,     4,     4,     4,     4,     4,   382,     4,     4,
+     147,    52,    53,    54,    55,    56,    57,     4,     4,     4,
+     423,   424,   425,    64,    65,     4,     4,     4,   150,   147,
+       4,     4,     4,     4,     4,   148,   148,     4,     4,   148,
+     148,   444,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   135,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,   146,     4,     4,
+       4,     4,     4,     4,     4,     4,   148,     4,     4,     4,
+       4,     4,   150,     4,     4,     4,   147,     4,     4,     4,
+       4,   148,     4,     4,   150,     4,     4,     4,     4,     4,
+       4,     4,     4,     4,     4,     4,   147,     4,   511,   538,
+     539,     4,   148,     4,     4,     4,   538,   539,     4,   150,
+       4,   150,   150,     4,   150,   528,     4,     4,   148,     4,
+     552,   148,   148,     4,   563,     4,   150,   563,   150,   150,
+       4,   563,     4,     4,     7,     3,     3,     7,     7,   563,
+     147,     7,     7,   147,   147,     5,   563,     5,     5,     5,
+       3,     5,     7,     5,     5,     5,   147,   563,     7,     7,
+       7,   147,   563,     8,     5,     5,   118,    87,   147,   147,
+       7,     7,   563,   147,   147,   147,   147,   147,   563,   147,
+     147,   147,   147,   147,   147,   147,   147,   147,   147,   147,
+     147,   147,   147,   147,   147,     7,   147,     7,     7,     7,
+       4,   124,     7,     4,     7,     4,     4,     4,     4,   147,
+     443,     6,     6,     6,     3,     6,     3,     3,     6,     4,
+       4,     4,     4,     4,     4,     3,   489,     6,     3,     6,
+       4,     4,     8,     4,     4,     4,     4,     4,     4,   147,
+       4,     6,   148,     3,   148,   150,     4,     8,   150,     5,
+     148,   148,     7,   148,     8,   148,   148,     8,   148,   148,
+       4,   147,     4,   147,   147,   147,     4,   147,     5,   147,
+     147,   147,   147,     7,     4,     4,     4,     4,   529,   534,
+     352,   346,   319,   539,   148,   147,   147,   150,   727,   148,
+     727,   742,   748,   746,   755,   727,   400,   736,   730,   732,
+     739,   733,   148,   741,   736,   730,   730,   739,   730,   733,
+     736,   368,   736,   730,   746,   739,   733,   739,   849,   736,
+     735,   733,   739,   730,   730,   768,   736,   738,   392,   730,
+     771,   736,   739,   739,   766,   397,   766,   769,   739,   730,
+     371,   769,   766,   563,   730,   730,   552,   382,   739,   766,
+     730,   759,   863,   739,   739,   713,   416,   879,   891,   739,
+     908,    -1,    -1,   769,    -1,   766,    -1,    -1,   769,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   769,    -1,
+      -1,    -1,    -1,    -1,   769,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   845,    -1,    -1,    -1,
-      -1,    -1,    -1,   845,    -1,    -1,    -1,    -1,    -1,   858,
-      -1,    -1,    -1,   845,    -1,   845,   858,    -1,    -1,    -1,
-     845,    -1,    -1,    -1,    -1,    -1,   875,    -1,   845,    -1,
-      -1,    -1,    -1,   875,   845,   845,   845,    -1,    -1,    -1,
-     845,   845,    -1,    -1,    -1,    -1,   845
+     849,    -1,    -1,    -1,    -1,    -1,    -1,   849,    -1,    -1,
+      -1,    -1,    -1,   862,    -1,   849,    -1,   849,    -1,    -1,
+     862,    -1,   849,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     879,    -1,   849,   849,    -1,    -1,    -1,   879,   849,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   849,    -1,
+      -1,    -1,    -1,   849,   849,    -1,    -1,    -1,    -1,   849
   };
 
   const unsigned short int
@@ -3986,72 +3988,72 @@ namespace isc { namespace dhcp {
       52,    54,    55,    58,    59,    60,   180,   228,   318,   319,
      320,   321,   322,   323,   324,   326,   328,   330,   331,   333,
      364,   366,    53,    56,    57,   180,   228,   322,   328,   342,
-     343,   344,   345,   346,   348,   349,   350,   351,    89,    90,
-     180,   255,   256,   257,   259,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   180,
-     428,   429,   430,   431,   433,   435,   436,   438,   439,   440,
-     443,   445,   446,   447,   448,   451,     6,     3,     4,     8,
-       3,   186,   460,   454,   456,   458,     4,     3,     8,   198,
-       4,     4,   380,   382,   384,   213,   215,     4,     4,     4,
-       4,   272,   309,   335,   301,   365,   367,   239,   406,   248,
-     262,     4,   417,   425,     3,     8,   204,   206,   209,     4,
-       3,     8,   408,   284,   286,   288,   353,   282,   290,   292,
-       4,     4,   296,   294,   369,   402,     3,     8,   363,     3,
-       8,   400,   388,   390,   394,   392,   398,   396,   386,     8,
-       3,     8,   325,   229,     4,   329,   327,   332,     4,     8,
-       3,   347,     4,     4,     8,     3,   258,   260,     3,     8,
-       4,   432,   434,     4,   437,     4,     4,   441,   444,     4,
-       4,     4,   449,   452,     3,     8,   165,   165,   147,     4,
-       4,     4,     4,     4,   184,     4,   150,   150,     4,     4,
-       4,     4,     4,   148,   148,   148,   148,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,   148,     4,     4,
-     190,     4,     4,     4,   150,   200,    77,   180,   228,   308,
-     334,   379,   381,   383,   409,   410,   411,   412,   413,     4,
-       4,     4,     4,     4,     4,     4,   148,   150,     4,     4,
-       4,     4,   280,     4,   361,     4,     4,     4,     4,     4,
-       4,     4,     4,   378,     4,     4,   148,     4,     4,     4,
-     150,   320,     4,   150,   150,   344,     4,     4,   256,   150,
-       4,     4,   148,     4,   148,   148,     4,     4,   150,   150,
-     150,     4,     4,   429,     4,     7,     7,   165,   165,   165,
-       7,   147,   147,   147,     7,     7,     5,     5,     5,     5,
-     167,   169,   165,     5,     5,     5,     7,     7,     7,     5,
-     176,    14,    15,   207,    17,    18,   210,   414,     8,     3,
-     147,   147,   147,     5,   147,   147,   147,    72,    73,    74,
-     297,   147,     5,     7,   147,   176,   147,   147,   147,   147,
+     343,   344,   345,   346,   348,   349,   350,   351,   364,   366,
+      89,    90,   180,   255,   256,   257,   259,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   180,   428,   429,   430,   431,   433,   435,   436,   438,
+     439,   440,   443,   445,   446,   447,   448,   451,     6,     3,
+       4,     8,     3,   186,   460,   454,   456,   458,     4,     3,
+       8,   198,     4,     4,   380,   382,   384,   213,   215,     4,
+       4,     4,     4,   272,   309,   335,   301,   365,   367,   239,
+     406,   248,   262,     4,   417,   425,     3,     8,   204,   206,
+     209,     4,     3,     8,   408,   284,   286,   288,   353,   282,
+     290,   292,     4,     4,   296,   294,   369,   402,     3,     8,
+     363,     3,     8,   400,   388,   390,   394,   392,   398,   396,
+     386,     8,     3,     8,   325,   229,     4,   329,   327,   332,
+       4,     8,     3,   347,     4,     4,     8,     3,   258,   260,
+       3,     8,     4,   432,   434,     4,   437,     4,     4,   441,
+     444,     4,     4,     4,   449,   452,     3,     8,   165,   165,
+     147,     4,     4,     4,     4,     4,   184,     4,   150,   150,
+       4,     4,     4,     4,     4,   148,   148,   148,   148,     4,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,   148,
+       4,     4,   190,     4,     4,     4,   150,   200,    77,   180,
+     228,   308,   334,   364,   366,   379,   381,   383,   409,   410,
+     411,   412,   413,     4,     4,     4,     4,     4,     4,     4,
+     148,   150,     4,     4,     4,     4,   280,     4,   361,     4,
+       4,     4,     4,     4,     4,     4,     4,   378,     4,     4,
+     148,     4,     4,     4,   150,   320,     4,   150,   150,   344,
+       4,     4,   256,   150,     4,     4,   148,     4,   148,   148,
+       4,     4,   150,   150,   150,     4,     4,   429,     4,     7,
+       7,   165,   165,   165,     7,   147,   147,   147,     7,     7,
+       5,     5,     5,     5,   167,   169,   165,     5,     5,     5,
+       7,     7,     7,     5,   176,    14,    15,   207,    17,    18,
+     210,   414,     8,     3,   147,   147,   147,     5,   147,   147,
+     147,    72,    73,    74,   297,   147,     5,     7,   147,   176,
      147,   147,   147,   147,   147,   147,   147,   147,   147,   147,
-     165,   147,   147,   147,    15,   117,   442,   118,   119,   120,
-     121,   122,   150,   450,   147,   165,   189,   124,   461,   462,
-     463,   199,    27,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,   180,   216,   217,   218,   221,   223,   225,
-     227,   228,   230,   231,   232,   233,   234,   236,   216,     7,
-     273,   274,   275,     7,   312,   313,   314,     7,   336,   337,
-     338,     7,   302,   303,   304,    80,    81,    82,    83,    85,
-     240,   241,   242,   243,   244,   245,   246,   293,   407,     7,
-     249,   250,   251,    92,    93,    94,    95,    96,    97,   263,
-     264,   265,   266,   267,   268,   269,   270,   100,   101,   418,
-     419,   420,   422,   428,   177,     4,   411,     7,   354,   355,
-     356,     7,   370,   371,   372,    87,   403,     8,   464,     3,
-       8,     8,   219,   222,   224,   226,     4,     4,     4,     4,
-       4,   235,   237,     3,     8,     8,   276,     6,     3,   315,
-       6,     3,   339,     6,     3,   305,     6,     3,     3,     6,
-       3,     6,   252,     6,     3,     4,     4,     4,     4,     4,
-       4,     3,     8,   421,   423,     3,     8,     8,   147,   178,
-     179,   147,   357,     6,     3,   373,     6,     3,   404,     8,
-       4,   462,     4,     4,     4,     4,   148,   150,   148,   150,
-     148,     4,     4,   217,   279,   275,   318,   314,   342,   338,
-     180,   191,   192,   193,   196,   228,   271,   289,   293,   295,
-     306,   307,   334,   364,   366,   379,   381,   383,   401,   304,
-     241,   293,   255,   251,   148,   148,   148,   148,   148,   148,
-     264,     4,     4,   419,     6,     3,   360,   356,   376,   372,
-       4,     5,    28,    29,    30,    31,   220,   147,   147,   147,
-     147,   147,     8,     8,     8,     3,     8,     8,   147,   147,
-     147,     8,     8,   147,     7,   465,   466,   307,   467,     3,
-       6,   125,   127,   128,   180,   228,   468,   469,   470,   471,
-     473,   466,   474,     4,   472,     3,     8,     4,   148,     4,
-     469,     5,   147,     7,   475,   476,   477,     3,     6,   126,
-     129,   130,   131,   478,   479,   480,   482,   483,   484,   476,
-     481,     4,     4,     4,     3,     8,     4,   150,   148,   148,
-     479,   147
+     147,   147,   147,   147,   165,   147,   147,   147,    15,   117,
+     442,   118,   119,   120,   121,   122,   150,   450,   147,   165,
+     189,   124,   461,   462,   463,   199,    27,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,   180,   216,   217,
+     218,   221,   223,   225,   227,   228,   230,   231,   232,   233,
+     234,   236,   216,     7,   273,   274,   275,     7,   312,   313,
+     314,     7,   336,   337,   338,     7,   302,   303,   304,    80,
+      81,    82,    83,    85,   240,   241,   242,   243,   244,   245,
+     246,   293,   407,     7,   249,   250,   251,    92,    93,    94,
+      95,    96,    97,   263,   264,   265,   266,   267,   268,   269,
+     270,   100,   101,   418,   419,   420,   422,   428,   177,     4,
+     411,     7,   354,   355,   356,     7,   370,   371,   372,    87,
+     403,     8,   464,     3,     8,     8,   219,   222,   224,   226,
+       4,     4,     4,     4,     4,   235,   237,     3,     8,     8,
+     276,     6,     3,   315,     6,     3,   339,     6,     3,   305,
+       6,     3,     3,     6,     3,     6,   252,     6,     3,     4,
+       4,     4,     4,     4,     4,     3,     8,   421,   423,     3,
+       8,     8,   147,   178,   179,   147,   357,     6,     3,   373,
+       6,     3,   404,     8,     4,   462,     4,     4,     4,     4,
+     148,   150,   148,   150,   148,     4,     4,   217,   279,   275,
+     318,   314,   342,   338,   180,   191,   192,   193,   196,   228,
+     271,   289,   293,   295,   306,   307,   334,   364,   366,   379,
+     381,   383,   401,   304,   241,   293,   255,   251,   148,   148,
+     148,   148,   148,   148,   264,     4,     4,   419,     6,     3,
+     360,   356,   376,   372,     4,     5,    28,    29,    30,    31,
+     220,   147,   147,   147,   147,   147,     8,     8,     8,     3,
+       8,     8,   147,   147,   147,     8,     8,   147,     7,   465,
+     466,   307,   467,     3,     6,   125,   127,   128,   180,   228,
+     468,   469,   470,   471,   473,   466,   474,     4,   472,     3,
+       8,     4,   148,     4,   469,     5,   147,     7,   475,   476,
+     477,     3,     6,   126,   129,   130,   131,   478,   479,   480,
+     482,   483,   484,   476,   481,     4,     4,     4,     3,     8,
+       4,   150,   148,   148,   479,   147
   };
 
   const unsigned short int
@@ -4092,28 +4094,28 @@ namespace isc { namespace dhcp {
      320,   320,   320,   320,   321,   322,   323,   325,   324,   327,
      326,   329,   328,   330,   332,   331,   333,   335,   334,   336,
      336,   337,   337,   339,   338,   341,   340,   342,   342,   343,
-     343,   344,   344,   344,   344,   344,   344,   344,   345,   347,
-     346,   348,   349,   350,   351,   353,   352,   354,   354,   355,
-     355,   357,   356,   359,   358,   360,   360,   361,   361,   361,
-     361,   361,   363,   362,   365,   364,   367,   366,   369,   368,
-     370,   370,   371,   371,   373,   372,   375,   374,   376,   376,
-     377,   377,   378,   378,   378,   378,   378,   378,   378,   378,
-     378,   378,   378,   378,   378,   380,   379,   382,   381,   384,
-     383,   386,   385,   388,   387,   390,   389,   392,   391,   394,
-     393,   396,   395,   398,   397,   400,   399,   402,   401,   404,
-     403,   406,   405,   407,   407,   408,   293,   409,   409,   410,
-     410,   411,   411,   411,   411,   411,   411,   411,   411,   412,
-     414,   413,   415,   417,   416,   418,   418,   419,   419,   421,
-     420,   423,   422,   425,   424,   427,   426,   428,   428,   429,
-     429,   429,   429,   429,   429,   429,   429,   429,   429,   429,
-     429,   429,   429,   429,   430,   432,   431,   434,   433,   435,
-     437,   436,   438,   439,   441,   440,   442,   442,   444,   443,
-     445,   446,   447,   449,   448,   450,   450,   450,   450,   450,
-     452,   451,   454,   453,   456,   455,   458,   457,   460,   459,
-     461,   461,   462,   464,   463,   465,   465,   467,   466,   468,
-     468,   469,   469,   469,   469,   469,   470,   472,   471,   474,
-     473,   475,   475,   477,   476,   478,   478,   479,   479,   479,
-     479,   481,   480,   482,   483,   484
+     343,   344,   344,   344,   344,   344,   344,   344,   344,   344,
+     345,   347,   346,   348,   349,   350,   351,   353,   352,   354,
+     354,   355,   355,   357,   356,   359,   358,   360,   360,   361,
+     361,   361,   361,   361,   363,   362,   365,   364,   367,   366,
+     369,   368,   370,   370,   371,   371,   373,   372,   375,   374,
+     376,   376,   377,   377,   378,   378,   378,   378,   378,   378,
+     378,   378,   378,   378,   378,   378,   378,   380,   379,   382,
+     381,   384,   383,   386,   385,   388,   387,   390,   389,   392,
+     391,   394,   393,   396,   395,   398,   397,   400,   399,   402,
+     401,   404,   403,   406,   405,   407,   407,   408,   293,   409,
+     409,   410,   410,   411,   411,   411,   411,   411,   411,   411,
+     411,   411,   411,   412,   414,   413,   415,   417,   416,   418,
+     418,   419,   419,   421,   420,   423,   422,   425,   424,   427,
+     426,   428,   428,   429,   429,   429,   429,   429,   429,   429,
+     429,   429,   429,   429,   429,   429,   429,   429,   430,   432,
+     431,   434,   433,   435,   437,   436,   438,   439,   441,   440,
+     442,   442,   444,   443,   445,   446,   447,   449,   448,   450,
+     450,   450,   450,   450,   452,   451,   454,   453,   456,   455,
+     458,   457,   460,   459,   461,   461,   462,   464,   463,   465,
+     465,   467,   466,   468,   468,   469,   469,   469,   469,   469,
+     470,   472,   471,   474,   473,   475,   475,   477,   476,   478,
+     478,   479,   479,   479,   479,   481,   480,   482,   483,   484
   };
 
   const unsigned char
@@ -4154,28 +4156,28 @@ namespace isc { namespace dhcp {
        1,     1,     1,     1,     1,     3,     1,     0,     4,     0,
        4,     0,     4,     1,     0,     4,     3,     0,     6,     0,
        1,     1,     3,     0,     4,     0,     4,     0,     1,     1,
-       3,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       4,     1,     1,     3,     3,     0,     6,     0,     1,     1,
-       3,     0,     4,     0,     4,     1,     3,     1,     1,     1,
-       1,     1,     0,     4,     0,     4,     0,     4,     0,     6,
-       0,     1,     1,     3,     0,     4,     0,     4,     0,     1,
-       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
-       4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
-       4,     0,     4,     0,     4,     0,     4,     0,     6,     0,
-       4,     0,     6,     1,     3,     0,     4,     0,     1,     1,
        3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     4,     3,     0,     6,     1,     3,     1,     1,     0,
-       4,     0,     4,     0,     6,     0,     4,     1,     3,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     0,     4,     0,     4,     3,
-       0,     4,     3,     3,     0,     4,     1,     1,     0,     4,
-       3,     3,     3,     0,     4,     1,     1,     1,     1,     1,
-       0,     4,     0,     4,     0,     4,     0,     4,     0,     6,
-       1,     3,     1,     0,     6,     1,     3,     0,     4,     1,
-       3,     1,     1,     1,     1,     1,     3,     0,     4,     0,
-       6,     1,     3,     0,     4,     1,     3,     1,     1,     1,
-       1,     0,     4,     3,     3,     3
+       1,     0,     4,     1,     1,     3,     3,     0,     6,     0,
+       1,     1,     3,     0,     4,     0,     4,     1,     3,     1,
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
+       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
+       0,     1,     1,     3,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     4,     0,
+       4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
+       4,     0,     4,     0,     4,     0,     4,     0,     4,     0,
+       6,     0,     4,     0,     6,     1,     3,     0,     4,     0,
+       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     3,     0,     6,     1,
+       3,     1,     1,     0,     4,     0,     4,     0,     6,     0,
+       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     0,
+       4,     0,     4,     3,     0,     4,     3,     3,     0,     4,
+       1,     1,     0,     4,     3,     3,     3,     0,     4,     1,
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     6,     1,     3,     1,     0,     6,     1,
+       3,     0,     4,     1,     3,     1,     1,     1,     1,     1,
+       3,     0,     4,     0,     6,     1,     3,     0,     4,     1,
+       3,     1,     1,     1,     1,     0,     4,     3,     3,     3
   };
 
 
@@ -4349,28 +4351,28 @@ namespace isc { namespace dhcp {
     1140,  1141,  1142,  1143,  1146,  1148,  1153,  1155,  1155,  1163,
     1163,  1171,  1171,  1179,  1181,  1181,  1189,  1198,  1198,  1210,
     1211,  1216,  1217,  1222,  1222,  1234,  1234,  1246,  1247,  1252,
-    1253,  1258,  1259,  1260,  1261,  1262,  1263,  1264,  1267,  1269,
-    1269,  1277,  1279,  1281,  1286,  1294,  1294,  1306,  1307,  1310,
-    1311,  1314,  1314,  1324,  1324,  1334,  1335,  1338,  1339,  1340,
-    1341,  1342,  1345,  1345,  1353,  1353,  1360,  1360,  1372,  1372,
-    1382,  1383,  1386,  1387,  1390,  1390,  1399,  1399,  1408,  1409,
-    1412,  1413,  1417,  1418,  1419,  1420,  1421,  1422,  1423,  1424,
-    1425,  1426,  1427,  1428,  1429,  1432,  1432,  1440,  1440,  1448,
-    1448,  1456,  1456,  1464,  1464,  1472,  1472,  1480,  1480,  1488,
-    1488,  1496,  1496,  1504,  1504,  1512,  1512,  1525,  1525,  1535,
-    1535,  1546,  1546,  1556,  1557,  1560,  1560,  1570,  1571,  1574,
-    1575,  1578,  1579,  1580,  1581,  1582,  1583,  1584,  1585,  1588,
-    1590,  1590,  1602,  1609,  1609,  1619,  1620,  1623,  1624,  1627,
-    1627,  1635,  1635,  1645,  1645,  1657,  1657,  1667,  1668,  1671,
-    1672,  1673,  1674,  1675,  1676,  1677,  1678,  1679,  1680,  1681,
-    1682,  1683,  1684,  1685,  1688,  1693,  1693,  1701,  1701,  1709,
-    1714,  1714,  1722,  1727,  1732,  1732,  1740,  1741,  1744,  1744,
-    1752,  1757,  1762,  1767,  1767,  1775,  1778,  1781,  1784,  1787,
-    1793,  1793,  1803,  1803,  1810,  1810,  1817,  1817,  1829,  1829,
-    1842,  1843,  1847,  1851,  1851,  1863,  1864,  1868,  1868,  1876,
-    1877,  1880,  1881,  1882,  1883,  1884,  1887,  1892,  1892,  1900,
-    1900,  1910,  1911,  1914,  1914,  1922,  1923,  1926,  1927,  1928,
-    1929,  1932,  1932,  1940,  1945,  1950
+    1253,  1258,  1259,  1260,  1261,  1262,  1263,  1264,  1265,  1266,
+    1269,  1271,  1271,  1279,  1281,  1283,  1288,  1296,  1296,  1308,
+    1309,  1312,  1313,  1316,  1316,  1326,  1326,  1336,  1337,  1340,
+    1341,  1342,  1343,  1344,  1347,  1347,  1355,  1355,  1362,  1362,
+    1374,  1374,  1384,  1385,  1388,  1389,  1392,  1392,  1401,  1401,
+    1410,  1411,  1414,  1415,  1419,  1420,  1421,  1422,  1423,  1424,
+    1425,  1426,  1427,  1428,  1429,  1430,  1431,  1434,  1434,  1442,
+    1442,  1450,  1450,  1458,  1458,  1466,  1466,  1474,  1474,  1482,
+    1482,  1490,  1490,  1498,  1498,  1506,  1506,  1514,  1514,  1527,
+    1527,  1537,  1537,  1548,  1548,  1558,  1559,  1562,  1562,  1572,
+    1573,  1576,  1577,  1580,  1581,  1582,  1583,  1584,  1585,  1586,
+    1587,  1588,  1589,  1592,  1594,  1594,  1606,  1613,  1613,  1623,
+    1624,  1627,  1628,  1631,  1631,  1639,  1639,  1649,  1649,  1661,
+    1661,  1671,  1672,  1675,  1676,  1677,  1678,  1679,  1680,  1681,
+    1682,  1683,  1684,  1685,  1686,  1687,  1688,  1689,  1692,  1697,
+    1697,  1705,  1705,  1713,  1718,  1718,  1726,  1731,  1736,  1736,
+    1744,  1745,  1748,  1748,  1756,  1761,  1766,  1771,  1771,  1779,
+    1782,  1785,  1788,  1791,  1797,  1797,  1807,  1807,  1814,  1814,
+    1821,  1821,  1833,  1833,  1846,  1847,  1851,  1855,  1855,  1867,
+    1868,  1872,  1872,  1880,  1881,  1884,  1885,  1886,  1887,  1888,
+    1891,  1896,  1896,  1904,  1904,  1914,  1915,  1918,  1918,  1926,
+    1927,  1930,  1931,  1932,  1933,  1936,  1936,  1944,  1949,  1954
   };
 
   // Print the state stack on the debug stream.
@@ -4405,8 +4407,8 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp4_parser.yy" // lalr1.cc:1167
 } } // isc::dhcp
-#line 4409 "dhcp4_parser.cc" // lalr1.cc:1167
-#line 1955 "dhcp4_parser.yy" // lalr1.cc:1168
+#line 4411 "dhcp4_parser.cc" // lalr1.cc:1167
+#line 1959 "dhcp4_parser.yy" // lalr1.cc:1168
 
 
 void
diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h
index c4a5bf4e35..e031d24e23 100644
--- a/src/bin/dhcp4/dhcp4_parser.h
+++ b/src/bin/dhcp4/dhcp4_parser.h
@@ -1411,7 +1411,7 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 826,     ///< Last index in yytable_.
+      yylast_ = 839,     ///< Last index in yytable_.
       yynnts_ = 334,  ///< Number of nonterminal symbols.
       yyfinal_ = 26, ///< Termination state number.
       yyterror_ = 1,
diff --git a/src/bin/dhcp4/location.hh b/src/bin/dhcp4/location.hh
index 7b817d24b9..fdfd16170a 100644
--- a/src/bin/dhcp4/location.hh
+++ b/src/bin/dhcp4/location.hh
@@ -1,4 +1,4 @@
-// Generated 201711290710
+// Generated 201711290839
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++
diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh
index 54b154225e..ec8e1612b8 100644
--- a/src/bin/dhcp4/position.hh
+++ b/src/bin/dhcp4/position.hh
@@ -1,4 +1,4 @@
-// Generated 201711290710
+// Generated 201711290839
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++
diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh
index c57c35db03..212517c695 100644
--- a/src/bin/dhcp4/stack.hh
+++ b/src/bin/dhcp4/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201711290710
+// Generated 201711290839
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++
diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc
index 5a392c2ab9..48bd38db46 100644
--- a/src/bin/dhcp6/dhcp6_lexer.cc
+++ b/src/bin/dhcp6/dhcp6_lexer.cc
@@ -1577,17 +1577,17 @@ static const flex_int16_t yy_rule_linenum[162] =
       459,  468,  480,  489,  498,  507,  516,  526,  536,  546,
       556,  567,  577,  587,  597,  607,  618,  629,  640,  651,
       660,  670,  679,  688,  704,  720,  729,  738,  747,  756,
-      765,  774,  783,  792,  801,  810,  824,  838,  847,  857,
-      867,  876,  886,  896,  905,  914,  923,  932,  942,  951,
-      960,  969,  978,  987,  996, 1005, 1014, 1023, 1033, 1042,
-
-     1051, 1061, 1072, 1082, 1091, 1100, 1109, 1120, 1130, 1139,
-     1149, 1159, 1168, 1177, 1186, 1195, 1205, 1214, 1224, 1233,
-     1242, 1251, 1260, 1269, 1278, 1287, 1296, 1305, 1314, 1323,
-     1332, 1341, 1350, 1359, 1368, 1377, 1386, 1395, 1404, 1413,
-     1422, 1431, 1440, 1450, 1548, 1553, 1558, 1563, 1564, 1565,
-     1566, 1567, 1568, 1570, 1588, 1601, 1606, 1610, 1612, 1614,
-     1616
+      765,  774,  783,  792,  801,  810,  826,  842,  851,  861,
+      871,  880,  890,  900,  909,  918,  927,  936,  946,  955,
+      964,  973,  982,  991, 1000, 1009, 1018, 1027, 1037, 1046,
+
+     1055, 1065, 1076, 1086, 1095, 1104, 1113, 1124, 1134, 1143,
+     1153, 1163, 1172, 1181, 1190, 1199, 1209, 1218, 1228, 1237,
+     1246, 1255, 1264, 1273, 1282, 1291, 1300, 1309, 1318, 1327,
+     1336, 1345, 1354, 1363, 1372, 1381, 1390, 1399, 1408, 1417,
+     1426, 1435, 1444, 1454, 1552, 1557, 1562, 1567, 1568, 1569,
+     1570, 1571, 1572, 1574, 1592, 1605, 1610, 1614, 1616, 1618,
+     1620
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -2983,6 +2983,8 @@ YY_RULE_SETUP
     case isc::dhcp::Parser6Context::SUBNET6:
     case isc::dhcp::Parser6Context::SHARED_NETWORK:
     case isc::dhcp::Parser6Context::OPTION_DEF:
+    case isc::dhcp::Parser6Context::OPTION_DATA:
+    case isc::dhcp::Parser6Context::CLIENT_CLASSES:
         return isc::dhcp::Dhcp6Parser::make_USER_CONTEXT(driver.loc_);
     default:
         return isc::dhcp::Dhcp6Parser::make_STRING("user-context", driver.loc_);
@@ -2991,7 +2993,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 824 "dhcp6_lexer.ll"
+#line 826 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3000,6 +3002,8 @@ YY_RULE_SETUP
     case isc::dhcp::Parser6Context::SUBNET6:
     case isc::dhcp::Parser6Context::SHARED_NETWORK:
     case isc::dhcp::Parser6Context::OPTION_DEF:
+    case isc::dhcp::Parser6Context::OPTION_DATA:
+    case isc::dhcp::Parser6Context::CLIENT_CLASSES:
         return isc::dhcp::Dhcp6Parser::make_COMMENT(driver.loc_);
     default:
         return isc::dhcp::Dhcp6Parser::make_STRING("comment", driver.loc_);
@@ -3008,7 +3012,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 838 "dhcp6_lexer.ll"
+#line 842 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3020,7 +3024,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 847 "dhcp6_lexer.ll"
+#line 851 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3033,7 +3037,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 857 "dhcp6_lexer.ll"
+#line 861 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3046,7 +3050,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 867 "dhcp6_lexer.ll"
+#line 871 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3058,7 +3062,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 876 "dhcp6_lexer.ll"
+#line 880 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3071,7 +3075,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 886 "dhcp6_lexer.ll"
+#line 890 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3084,7 +3088,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 896 "dhcp6_lexer.ll"
+#line 900 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3096,7 +3100,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 905 "dhcp6_lexer.ll"
+#line 909 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3108,7 +3112,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 914 "dhcp6_lexer.ll"
+#line 918 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3120,7 +3124,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 923 "dhcp6_lexer.ll"
+#line 927 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATION_MODE:
@@ -3132,7 +3136,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 932 "dhcp6_lexer.ll"
+#line 936 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3145,7 +3149,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 942 "dhcp6_lexer.ll"
+#line 946 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3157,7 +3161,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 951 "dhcp6_lexer.ll"
+#line 955 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3169,7 +3173,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 960 "dhcp6_lexer.ll"
+#line 964 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3181,7 +3185,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 969 "dhcp6_lexer.ll"
+#line 973 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -3193,7 +3197,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 978 "dhcp6_lexer.ll"
+#line 982 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGING:
@@ -3205,7 +3209,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 987 "dhcp6_lexer.ll"
+#line 991 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3217,7 +3221,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 996 "dhcp6_lexer.ll"
+#line 1000 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3229,7 +3233,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 1005 "dhcp6_lexer.ll"
+#line 1009 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3241,7 +3245,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 1014 "dhcp6_lexer.ll"
+#line 1018 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3253,7 +3257,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 1023 "dhcp6_lexer.ll"
+#line 1027 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OUTPUT_OPTIONS:
@@ -3265,7 +3269,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 1033 "dhcp6_lexer.ll"
+#line 1037 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3277,7 +3281,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 1042 "dhcp6_lexer.ll"
+#line 1046 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LOGGERS:
@@ -3289,7 +3293,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 1051 "dhcp6_lexer.ll"
+#line 1055 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3302,7 +3306,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 1061 "dhcp6_lexer.ll"
+#line 1065 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3316,7 +3320,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 1072 "dhcp6_lexer.ll"
+#line 1076 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CLIENT_CLASSES:
@@ -3329,7 +3333,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 1082 "dhcp6_lexer.ll"
+#line 1086 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3341,7 +3345,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 1091 "dhcp6_lexer.ll"
+#line 1095 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3353,7 +3357,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 1100 "dhcp6_lexer.ll"
+#line 1104 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3365,7 +3369,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 1109 "dhcp6_lexer.ll"
+#line 1113 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::MAC_SOURCES:
@@ -3379,7 +3383,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 1120 "dhcp6_lexer.ll"
+#line 1124 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3392,7 +3396,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 1130 "dhcp6_lexer.ll"
+#line 1134 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RESERVATIONS:
@@ -3404,7 +3408,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 1139 "dhcp6_lexer.ll"
+#line 1143 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS:
@@ -3417,7 +3421,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 1149 "dhcp6_lexer.ll"
+#line 1153 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3430,7 +3434,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 1159 "dhcp6_lexer.ll"
+#line 1163 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DATA:
@@ -3442,7 +3446,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 1168 "dhcp6_lexer.ll"
+#line 1172 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3454,7 +3458,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 1177 "dhcp6_lexer.ll"
+#line 1181 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3466,7 +3470,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 1186 "dhcp6_lexer.ll"
+#line 1190 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::OPTION_DEF:
@@ -3478,7 +3482,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 1195 "dhcp6_lexer.ll"
+#line 1199 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SUBNET6:
@@ -3491,7 +3495,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 1205 "dhcp6_lexer.ll"
+#line 1209 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::RELAY:
@@ -3503,7 +3507,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 1214 "dhcp6_lexer.ll"
+#line 1218 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3515,7 +3519,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 1224 "dhcp6_lexer.ll"
+#line 1228 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -3527,7 +3531,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 1233 "dhcp6_lexer.ll"
+#line 1237 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
@@ -3539,7 +3543,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 1242 "dhcp6_lexer.ll"
+#line 1246 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3551,7 +3555,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 1251 "dhcp6_lexer.ll"
+#line 1255 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -3563,7 +3567,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 1260 "dhcp6_lexer.ll"
+#line 1264 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -3575,7 +3579,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 1269 "dhcp6_lexer.ll"
+#line 1273 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DUID_TYPE:
@@ -3587,7 +3591,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 1278 "dhcp6_lexer.ll"
+#line 1282 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3599,7 +3603,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 1287 "dhcp6_lexer.ll"
+#line 1291 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3611,7 +3615,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 1296 "dhcp6_lexer.ll"
+#line 1300 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3623,7 +3627,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 1305 "dhcp6_lexer.ll"
+#line 1309 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::SERVER_ID:
@@ -3635,7 +3639,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 1314 "dhcp6_lexer.ll"
+#line 1318 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3647,7 +3651,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 1323 "dhcp6_lexer.ll"
+#line 1327 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -3659,7 +3663,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 1332 "dhcp6_lexer.ll"
+#line 1336 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -3671,7 +3675,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 1341 "dhcp6_lexer.ll"
+#line 1345 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -3683,7 +3687,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 1350 "dhcp6_lexer.ll"
+#line 1354 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -3695,7 +3699,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 1359 "dhcp6_lexer.ll"
+#line 1363 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -3707,7 +3711,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 1368 "dhcp6_lexer.ll"
+#line 1372 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING:
@@ -3719,7 +3723,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 1377 "dhcp6_lexer.ll"
+#line 1381 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3731,7 +3735,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 1386 "dhcp6_lexer.ll"
+#line 1390 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3743,7 +3747,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1395 "dhcp6_lexer.ll"
+#line 1399 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -3755,7 +3759,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 1404 "dhcp6_lexer.ll"
+#line 1408 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONTROL_SOCKET:
@@ -3767,7 +3771,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 1413 "dhcp6_lexer.ll"
+#line 1417 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::DHCP6:
@@ -3779,7 +3783,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 1422 "dhcp6_lexer.ll"
+#line 1426 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -3791,7 +3795,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 1431 "dhcp6_lexer.ll"
+#line 1435 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -3803,7 +3807,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1440 "dhcp6_lexer.ll"
+#line 1444 "dhcp6_lexer.ll"
 {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::CONFIG:
@@ -3815,7 +3819,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1450 "dhcp6_lexer.ll"
+#line 1454 "dhcp6_lexer.ll"
 {
     /* A string has been matched. It contains the actual string and single quotes.
        We need to get those quotes out of the way and just use its content, e.g.
@@ -3917,7 +3921,7 @@ YY_RULE_SETUP
 case 145:
 /* rule 145 can match eol */
 YY_RULE_SETUP
-#line 1548 "dhcp6_lexer.ll"
+#line 1552 "dhcp6_lexer.ll"
 {
     /* Bad string with a forbidden control character inside */
     driver.error(driver.loc_, "Invalid control in " + std::string(yytext));
@@ -3926,7 +3930,7 @@ YY_RULE_SETUP
 case 146:
 /* rule 146 can match eol */
 YY_RULE_SETUP
-#line 1553 "dhcp6_lexer.ll"
+#line 1557 "dhcp6_lexer.ll"
 {
     /* Bad string with a bad escape inside */
     driver.error(driver.loc_, "Bad escape in " + std::string(yytext));
@@ -3934,7 +3938,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1558 "dhcp6_lexer.ll"
+#line 1562 "dhcp6_lexer.ll"
 {
     /* Bad string with an open escape at the end */
     driver.error(driver.loc_, "Overflow escape in " + std::string(yytext));
@@ -3942,37 +3946,37 @@ YY_RULE_SETUP
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1563 "dhcp6_lexer.ll"
+#line 1567 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1564 "dhcp6_lexer.ll"
+#line 1568 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 1565 "dhcp6_lexer.ll"
+#line 1569 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1566 "dhcp6_lexer.ll"
+#line 1570 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1567 "dhcp6_lexer.ll"
+#line 1571 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1568 "dhcp6_lexer.ll"
+#line 1572 "dhcp6_lexer.ll"
 { return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 1570 "dhcp6_lexer.ll"
+#line 1574 "dhcp6_lexer.ll"
 {
     /* An integer was found. */
     std::string tmp(yytext);
@@ -3993,7 +3997,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 1588 "dhcp6_lexer.ll"
+#line 1592 "dhcp6_lexer.ll"
 {
     /* A floating point was found. */
     std::string tmp(yytext);
@@ -4009,7 +4013,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 1601 "dhcp6_lexer.ll"
+#line 1605 "dhcp6_lexer.ll"
 {
     string tmp(yytext);
     return isc::dhcp::Dhcp6Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@ -4017,33 +4021,33 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1606 "dhcp6_lexer.ll"
+#line 1610 "dhcp6_lexer.ll"
 {
    return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(driver.loc_);
 }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 1610 "dhcp6_lexer.ll"
+#line 1614 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 1612 "dhcp6_lexer.ll"
+#line 1616 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 1614 "dhcp6_lexer.ll"
+#line 1618 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 1616 "dhcp6_lexer.ll"
+#line 1620 "dhcp6_lexer.ll"
 driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1618 "dhcp6_lexer.ll"
+#line 1622 "dhcp6_lexer.ll"
 {
     if (driver.states_.empty()) {
         return isc::dhcp::Dhcp6Parser::make_END(driver.loc_);
@@ -4069,10 +4073,10 @@ case YY_STATE_EOF(INITIAL):
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 1641 "dhcp6_lexer.ll"
+#line 1645 "dhcp6_lexer.ll"
 ECHO;
 	YY_BREAK
-#line 4075 "dhcp6_lexer.cc"
+#line 4079 "dhcp6_lexer.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5177,7 +5181,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 1641 "dhcp6_lexer.ll"
+#line 1645 "dhcp6_lexer.ll"
 
 
 using namespace isc::dhcp;
diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc
index e07acf26bb..dfb373a4c2 100644
--- a/src/bin/dhcp6/dhcp6_parser.cc
+++ b/src/bin/dhcp6/dhcp6_parser.cc
@@ -2081,16 +2081,16 @@ namespace isc { namespace dhcp {
 #line 2082 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 342:
-#line 1233 "dhcp6_parser.yy" // lalr1.cc:859
+  case 344:
+#line 1235 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2090 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 343:
-#line 1235 "dhcp6_parser.yy" // lalr1.cc:859
+  case 345:
+#line 1237 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("data", data);
@@ -2099,8 +2099,8 @@ namespace isc { namespace dhcp {
 #line 2100 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 346:
-#line 1245 "dhcp6_parser.yy" // lalr1.cc:859
+  case 348:
+#line 1247 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("csv-format", space);
@@ -2108,8 +2108,8 @@ namespace isc { namespace dhcp {
 #line 2109 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 347:
-#line 1250 "dhcp6_parser.yy" // lalr1.cc:859
+  case 349:
+#line 1252 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-send", persist);
@@ -2117,8 +2117,8 @@ namespace isc { namespace dhcp {
 #line 2118 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 348:
-#line 1258 "dhcp6_parser.yy" // lalr1.cc:859
+  case 350:
+#line 1260 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pools", l);
@@ -2128,8 +2128,8 @@ namespace isc { namespace dhcp {
 #line 2129 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 349:
-#line 1263 "dhcp6_parser.yy" // lalr1.cc:859
+  case 351:
+#line 1265 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2137,8 +2137,8 @@ namespace isc { namespace dhcp {
 #line 2138 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 354:
-#line 1278 "dhcp6_parser.yy" // lalr1.cc:859
+  case 356:
+#line 1280 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2147,8 +2147,8 @@ namespace isc { namespace dhcp {
 #line 2148 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 355:
-#line 1282 "dhcp6_parser.yy" // lalr1.cc:859
+  case 357:
+#line 1284 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2157,8 +2157,8 @@ namespace isc { namespace dhcp {
 #line 2158 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 356:
-#line 1288 "dhcp6_parser.yy" // lalr1.cc:859
+  case 358:
+#line 1290 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // Parse the pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2167,8 +2167,8 @@ namespace isc { namespace dhcp {
 #line 2168 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 357:
-#line 1292 "dhcp6_parser.yy" // lalr1.cc:859
+  case 359:
+#line 1294 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The pool parameter is required.
     ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2176,16 +2176,16 @@ namespace isc { namespace dhcp {
 #line 2177 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 365:
-#line 1308 "dhcp6_parser.yy" // lalr1.cc:859
+  case 367:
+#line 1310 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2185 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 366:
-#line 1310 "dhcp6_parser.yy" // lalr1.cc:859
+  case 368:
+#line 1312 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pool", pool);
@@ -2194,16 +2194,16 @@ namespace isc { namespace dhcp {
 #line 2195 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 367:
-#line 1316 "dhcp6_parser.yy" // lalr1.cc:859
+  case 369:
+#line 1318 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2203 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 368:
-#line 1318 "dhcp6_parser.yy" // lalr1.cc:859
+  case 370:
+#line 1320 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->combine_set("user-context", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2211,16 +2211,16 @@ namespace isc { namespace dhcp {
 #line 2212 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 369:
-#line 1323 "dhcp6_parser.yy" // lalr1.cc:859
+  case 371:
+#line 1325 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2220 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 370:
-#line 1325 "dhcp6_parser.yy" // lalr1.cc:859
+  case 372:
+#line 1327 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr e(new MapElement(ctx.loc2pos(yystack_[3].location)));
     e->set("comment", yystack_[0].value.as< ElementPtr > ());
@@ -2230,8 +2230,8 @@ namespace isc { namespace dhcp {
 #line 2231 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 371:
-#line 1335 "dhcp6_parser.yy" // lalr1.cc:859
+  case 373:
+#line 1337 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("pd-pools", l);
@@ -2241,8 +2241,8 @@ namespace isc { namespace dhcp {
 #line 2242 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 372:
-#line 1340 "dhcp6_parser.yy" // lalr1.cc:859
+  case 374:
+#line 1342 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2250,8 +2250,8 @@ namespace isc { namespace dhcp {
 #line 2251 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 377:
-#line 1355 "dhcp6_parser.yy" // lalr1.cc:859
+  case 379:
+#line 1357 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2260,8 +2260,8 @@ namespace isc { namespace dhcp {
 #line 2261 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 378:
-#line 1359 "dhcp6_parser.yy" // lalr1.cc:859
+  case 380:
+#line 1361 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2272,8 +2272,8 @@ namespace isc { namespace dhcp {
 #line 2273 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 379:
-#line 1367 "dhcp6_parser.yy" // lalr1.cc:859
+  case 381:
+#line 1369 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // Parse the pd-pool list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2282,8 +2282,8 @@ namespace isc { namespace dhcp {
 #line 2283 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 380:
-#line 1371 "dhcp6_parser.yy" // lalr1.cc:859
+  case 382:
+#line 1373 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The prefix, prefix len and delegated len parameters are required.
     ctx.require("prefix", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2294,16 +2294,16 @@ namespace isc { namespace dhcp {
 #line 2295 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 392:
-#line 1394 "dhcp6_parser.yy" // lalr1.cc:859
+  case 394:
+#line 1396 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2303 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 393:
-#line 1396 "dhcp6_parser.yy" // lalr1.cc:859
+  case 395:
+#line 1398 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix", prf);
@@ -2312,8 +2312,8 @@ namespace isc { namespace dhcp {
 #line 2313 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 394:
-#line 1402 "dhcp6_parser.yy" // lalr1.cc:859
+  case 396:
+#line 1404 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefix-len", prf);
@@ -2321,16 +2321,16 @@ namespace isc { namespace dhcp {
 #line 2322 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 395:
-#line 1407 "dhcp6_parser.yy" // lalr1.cc:859
+  case 397:
+#line 1409 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2330 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 396:
-#line 1409 "dhcp6_parser.yy" // lalr1.cc:859
+  case 398:
+#line 1411 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix", prf);
@@ -2339,8 +2339,8 @@ namespace isc { namespace dhcp {
 #line 2340 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 397:
-#line 1415 "dhcp6_parser.yy" // lalr1.cc:859
+  case 399:
+#line 1417 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("excluded-prefix-len", prf);
@@ -2348,8 +2348,8 @@ namespace isc { namespace dhcp {
 #line 2349 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 398:
-#line 1420 "dhcp6_parser.yy" // lalr1.cc:859
+  case 400:
+#line 1422 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr deleg(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("delegated-len", deleg);
@@ -2357,8 +2357,8 @@ namespace isc { namespace dhcp {
 #line 2358 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 399:
-#line 1428 "dhcp6_parser.yy" // lalr1.cc:859
+  case 401:
+#line 1430 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("reservations", l);
@@ -2368,8 +2368,8 @@ namespace isc { namespace dhcp {
 #line 2369 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 400:
-#line 1433 "dhcp6_parser.yy" // lalr1.cc:859
+  case 402:
+#line 1435 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2377,8 +2377,8 @@ namespace isc { namespace dhcp {
 #line 2378 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 405:
-#line 1446 "dhcp6_parser.yy" // lalr1.cc:859
+  case 407:
+#line 1448 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2387,8 +2387,8 @@ namespace isc { namespace dhcp {
 #line 2388 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 406:
-#line 1450 "dhcp6_parser.yy" // lalr1.cc:859
+  case 408:
+#line 1452 "dhcp6_parser.yy" // lalr1.cc:859
     {
     /// @todo: an identifier parameter is required.
     ctx.stack_.pop_back();
@@ -2396,8 +2396,8 @@ namespace isc { namespace dhcp {
 #line 2397 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 407:
-#line 1455 "dhcp6_parser.yy" // lalr1.cc:859
+  case 409:
+#line 1457 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // Parse the reservations list entry map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2406,8 +2406,8 @@ namespace isc { namespace dhcp {
 #line 2407 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 408:
-#line 1459 "dhcp6_parser.yy" // lalr1.cc:859
+  case 410:
+#line 1461 "dhcp6_parser.yy" // lalr1.cc:859
     {
     /// @todo: an identifier parameter is required.
     // parsing completed
@@ -2415,8 +2415,8 @@ namespace isc { namespace dhcp {
 #line 2416 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 422:
-#line 1484 "dhcp6_parser.yy" // lalr1.cc:859
+  case 424:
+#line 1486 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-addresses", l);
@@ -2426,8 +2426,8 @@ namespace isc { namespace dhcp {
 #line 2427 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 423:
-#line 1489 "dhcp6_parser.yy" // lalr1.cc:859
+  case 425:
+#line 1491 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2435,8 +2435,8 @@ namespace isc { namespace dhcp {
 #line 2436 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 424:
-#line 1494 "dhcp6_parser.yy" // lalr1.cc:859
+  case 426:
+#line 1496 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("prefixes", l);
@@ -2446,8 +2446,8 @@ namespace isc { namespace dhcp {
 #line 2447 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 425:
-#line 1499 "dhcp6_parser.yy" // lalr1.cc:859
+  case 427:
+#line 1501 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2455,16 +2455,16 @@ namespace isc { namespace dhcp {
 #line 2456 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 426:
-#line 1504 "dhcp6_parser.yy" // lalr1.cc:859
+  case 428:
+#line 1506 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2464 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 427:
-#line 1506 "dhcp6_parser.yy" // lalr1.cc:859
+  case 429:
+#line 1508 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("duid", d);
@@ -2473,16 +2473,16 @@ namespace isc { namespace dhcp {
 #line 2474 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 428:
-#line 1512 "dhcp6_parser.yy" // lalr1.cc:859
+  case 430:
+#line 1514 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2482 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 429:
-#line 1514 "dhcp6_parser.yy" // lalr1.cc:859
+  case 431:
+#line 1516 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hw-address", hw);
@@ -2491,16 +2491,16 @@ namespace isc { namespace dhcp {
 #line 2492 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 430:
-#line 1520 "dhcp6_parser.yy" // lalr1.cc:859
+  case 432:
+#line 1522 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2500 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 431:
-#line 1522 "dhcp6_parser.yy" // lalr1.cc:859
+  case 433:
+#line 1524 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("hostname", host);
@@ -2509,16 +2509,16 @@ namespace isc { namespace dhcp {
 #line 2510 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 432:
-#line 1528 "dhcp6_parser.yy" // lalr1.cc:859
+  case 434:
+#line 1530 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2518 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 433:
-#line 1530 "dhcp6_parser.yy" // lalr1.cc:859
+  case 435:
+#line 1532 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flex-id", hw);
@@ -2527,8 +2527,8 @@ namespace isc { namespace dhcp {
 #line 2528 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 434:
-#line 1536 "dhcp6_parser.yy" // lalr1.cc:859
+  case 436:
+#line 1538 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", c);
@@ -2538,8 +2538,8 @@ namespace isc { namespace dhcp {
 #line 2539 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 435:
-#line 1541 "dhcp6_parser.yy" // lalr1.cc:859
+  case 437:
+#line 1543 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2547,8 +2547,8 @@ namespace isc { namespace dhcp {
 #line 2548 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 436:
-#line 1549 "dhcp6_parser.yy" // lalr1.cc:859
+  case 438:
+#line 1551 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("relay", m);
@@ -2558,8 +2558,8 @@ namespace isc { namespace dhcp {
 #line 2559 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 437:
-#line 1554 "dhcp6_parser.yy" // lalr1.cc:859
+  case 439:
+#line 1556 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2567,16 +2567,16 @@ namespace isc { namespace dhcp {
 #line 2568 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 438:
-#line 1559 "dhcp6_parser.yy" // lalr1.cc:859
+  case 440:
+#line 1561 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2576 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 439:
-#line 1561 "dhcp6_parser.yy" // lalr1.cc:859
+  case 441:
+#line 1563 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr ip(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ip-address", ip);
@@ -2585,8 +2585,8 @@ namespace isc { namespace dhcp {
 #line 2586 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 440:
-#line 1570 "dhcp6_parser.yy" // lalr1.cc:859
+  case 442:
+#line 1572 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("client-classes", l);
@@ -2596,8 +2596,8 @@ namespace isc { namespace dhcp {
 #line 2597 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 441:
-#line 1575 "dhcp6_parser.yy" // lalr1.cc:859
+  case 443:
+#line 1577 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2605,8 +2605,8 @@ namespace isc { namespace dhcp {
 #line 2606 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 444:
-#line 1584 "dhcp6_parser.yy" // lalr1.cc:859
+  case 446:
+#line 1586 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -2615,8 +2615,8 @@ namespace isc { namespace dhcp {
 #line 2616 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 445:
-#line 1588 "dhcp6_parser.yy" // lalr1.cc:859
+  case 447:
+#line 1590 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The name client class parameter is required.
     ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2625,16 +2625,16 @@ namespace isc { namespace dhcp {
 #line 2626 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 455:
-#line 1610 "dhcp6_parser.yy" // lalr1.cc:859
+  case 459:
+#line 1614 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2634 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 456:
-#line 1612 "dhcp6_parser.yy" // lalr1.cc:859
+  case 460:
+#line 1616 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("test", test);
@@ -2643,8 +2643,8 @@ namespace isc { namespace dhcp {
 #line 2644 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 457:
-#line 1621 "dhcp6_parser.yy" // lalr1.cc:859
+  case 461:
+#line 1625 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-id", m);
@@ -2654,8 +2654,8 @@ namespace isc { namespace dhcp {
 #line 2655 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 458:
-#line 1626 "dhcp6_parser.yy" // lalr1.cc:859
+  case 462:
+#line 1630 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The type parameter is required.
     ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -2665,16 +2665,16 @@ namespace isc { namespace dhcp {
 #line 2666 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 468:
-#line 1646 "dhcp6_parser.yy" // lalr1.cc:859
+  case 472:
+#line 1650 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.DUID_TYPE);
 }
 #line 2674 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 469:
-#line 1648 "dhcp6_parser.yy" // lalr1.cc:859
+  case 473:
+#line 1652 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2682,26 +2682,26 @@ namespace isc { namespace dhcp {
 #line 2683 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 470:
-#line 1653 "dhcp6_parser.yy" // lalr1.cc:859
+  case 474:
+#line 1657 "dhcp6_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); }
 #line 2689 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 471:
-#line 1654 "dhcp6_parser.yy" // lalr1.cc:859
+  case 475:
+#line 1658 "dhcp6_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); }
 #line 2695 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 472:
-#line 1655 "dhcp6_parser.yy" // lalr1.cc:859
+  case 476:
+#line 1659 "dhcp6_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); }
 #line 2701 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 473:
-#line 1658 "dhcp6_parser.yy" // lalr1.cc:859
+  case 477:
+#line 1662 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr htype(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("htype", htype);
@@ -2709,16 +2709,16 @@ namespace isc { namespace dhcp {
 #line 2710 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 474:
-#line 1663 "dhcp6_parser.yy" // lalr1.cc:859
+  case 478:
+#line 1667 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2718 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 475:
-#line 1665 "dhcp6_parser.yy" // lalr1.cc:859
+  case 479:
+#line 1669 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr id(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("identifier", id);
@@ -2727,8 +2727,8 @@ namespace isc { namespace dhcp {
 #line 2728 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 476:
-#line 1671 "dhcp6_parser.yy" // lalr1.cc:859
+  case 480:
+#line 1675 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("time", time);
@@ -2736,8 +2736,8 @@ namespace isc { namespace dhcp {
 #line 2737 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 477:
-#line 1676 "dhcp6_parser.yy" // lalr1.cc:859
+  case 481:
+#line 1680 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enterprise-id", time);
@@ -2745,8 +2745,8 @@ namespace isc { namespace dhcp {
 #line 2746 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 478:
-#line 1683 "dhcp6_parser.yy" // lalr1.cc:859
+  case 482:
+#line 1687 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp4o6-port", time);
@@ -2754,8 +2754,8 @@ namespace isc { namespace dhcp {
 #line 2755 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 479:
-#line 1690 "dhcp6_parser.yy" // lalr1.cc:859
+  case 483:
+#line 1694 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("control-socket", m);
@@ -2765,8 +2765,8 @@ namespace isc { namespace dhcp {
 #line 2766 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 480:
-#line 1695 "dhcp6_parser.yy" // lalr1.cc:859
+  case 484:
+#line 1699 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -2774,16 +2774,16 @@ namespace isc { namespace dhcp {
 #line 2775 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 485:
-#line 1708 "dhcp6_parser.yy" // lalr1.cc:859
+  case 489:
+#line 1712 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2783 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 486:
-#line 1710 "dhcp6_parser.yy" // lalr1.cc:859
+  case 490:
+#line 1714 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-type", stype);
@@ -2792,16 +2792,16 @@ namespace isc { namespace dhcp {
 #line 2793 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 487:
-#line 1716 "dhcp6_parser.yy" // lalr1.cc:859
+  case 491:
+#line 1720 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2801 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 488:
-#line 1718 "dhcp6_parser.yy" // lalr1.cc:859
+  case 492:
+#line 1722 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("socket-name", name);
@@ -2810,8 +2810,8 @@ namespace isc { namespace dhcp {
 #line 2811 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 489:
-#line 1726 "dhcp6_parser.yy" // lalr1.cc:859
+  case 493:
+#line 1730 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("dhcp-ddns", m);
@@ -2821,8 +2821,8 @@ namespace isc { namespace dhcp {
 #line 2822 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 490:
-#line 1731 "dhcp6_parser.yy" // lalr1.cc:859
+  case 494:
+#line 1735 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location));
@@ -2832,8 +2832,8 @@ namespace isc { namespace dhcp {
 #line 2833 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 491:
-#line 1738 "dhcp6_parser.yy" // lalr1.cc:859
+  case 495:
+#line 1742 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // Parse the dhcp-ddns map
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
@@ -2842,8 +2842,8 @@ namespace isc { namespace dhcp {
 #line 2843 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 492:
-#line 1742 "dhcp6_parser.yy" // lalr1.cc:859
+  case 496:
+#line 1746 "dhcp6_parser.yy" // lalr1.cc:859
     {
     // The enable updates DHCP DDNS parameter is required.
     ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location));
@@ -2852,8 +2852,8 @@ namespace isc { namespace dhcp {
 #line 2853 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 510:
-#line 1769 "dhcp6_parser.yy" // lalr1.cc:859
+  case 514:
+#line 1773 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("enable-updates", b);
@@ -2861,16 +2861,16 @@ namespace isc { namespace dhcp {
 #line 2862 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 511:
-#line 1774 "dhcp6_parser.yy" // lalr1.cc:859
+  case 515:
+#line 1778 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2870 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 512:
-#line 1776 "dhcp6_parser.yy" // lalr1.cc:859
+  case 516:
+#line 1780 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("qualifying-suffix", s);
@@ -2879,16 +2879,16 @@ namespace isc { namespace dhcp {
 #line 2880 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 513:
-#line 1782 "dhcp6_parser.yy" // lalr1.cc:859
+  case 517:
+#line 1786 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2888 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 514:
-#line 1784 "dhcp6_parser.yy" // lalr1.cc:859
+  case 518:
+#line 1788 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-ip", s);
@@ -2897,8 +2897,8 @@ namespace isc { namespace dhcp {
 #line 2898 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 515:
-#line 1790 "dhcp6_parser.yy" // lalr1.cc:859
+  case 519:
+#line 1794 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("server-port", i);
@@ -2906,16 +2906,16 @@ namespace isc { namespace dhcp {
 #line 2907 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 516:
-#line 1795 "dhcp6_parser.yy" // lalr1.cc:859
+  case 520:
+#line 1799 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 2915 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 517:
-#line 1797 "dhcp6_parser.yy" // lalr1.cc:859
+  case 521:
+#line 1801 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-ip", s);
@@ -2924,8 +2924,8 @@ namespace isc { namespace dhcp {
 #line 2925 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 518:
-#line 1803 "dhcp6_parser.yy" // lalr1.cc:859
+  case 522:
+#line 1807 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("sender-port", i);
@@ -2933,8 +2933,8 @@ namespace isc { namespace dhcp {
 #line 2934 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 519:
-#line 1808 "dhcp6_parser.yy" // lalr1.cc:859
+  case 523:
+#line 1812 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("max-queue-size", i);
@@ -2942,16 +2942,16 @@ namespace isc { namespace dhcp {
 #line 2943 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 520:
-#line 1813 "dhcp6_parser.yy" // lalr1.cc:859
+  case 524:
+#line 1817 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NCR_PROTOCOL);
 }
 #line 2951 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 521:
-#line 1815 "dhcp6_parser.yy" // lalr1.cc:859
+  case 525:
+#line 1819 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -2959,28 +2959,28 @@ namespace isc { namespace dhcp {
 #line 2960 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 522:
-#line 1821 "dhcp6_parser.yy" // lalr1.cc:859
+  case 526:
+#line 1825 "dhcp6_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); }
 #line 2966 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 523:
-#line 1822 "dhcp6_parser.yy" // lalr1.cc:859
+  case 527:
+#line 1826 "dhcp6_parser.yy" // lalr1.cc:859
     { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); }
 #line 2972 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 524:
-#line 1825 "dhcp6_parser.yy" // lalr1.cc:859
+  case 528:
+#line 1829 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NCR_FORMAT);
 }
 #line 2980 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 525:
-#line 1827 "dhcp6_parser.yy" // lalr1.cc:859
+  case 529:
+#line 1831 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("ncr-format", json);
@@ -2989,8 +2989,8 @@ namespace isc { namespace dhcp {
 #line 2990 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 526:
-#line 1833 "dhcp6_parser.yy" // lalr1.cc:859
+  case 530:
+#line 1837 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("always-include-fqdn", b);
@@ -2998,8 +2998,8 @@ namespace isc { namespace dhcp {
 #line 2999 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 527:
-#line 1838 "dhcp6_parser.yy" // lalr1.cc:859
+  case 531:
+#line 1842 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-no-update", b);
@@ -3007,8 +3007,8 @@ namespace isc { namespace dhcp {
 #line 3008 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 528:
-#line 1843 "dhcp6_parser.yy" // lalr1.cc:859
+  case 532:
+#line 1847 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("override-client-update", b);
@@ -3016,16 +3016,16 @@ namespace isc { namespace dhcp {
 #line 3017 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 529:
-#line 1848 "dhcp6_parser.yy" // lalr1.cc:859
+  case 533:
+#line 1852 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.REPLACE_CLIENT_NAME);
 }
 #line 3025 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 530:
-#line 1850 "dhcp6_parser.yy" // lalr1.cc:859
+  case 534:
+#line 1854 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3033,40 +3033,40 @@ namespace isc { namespace dhcp {
 #line 3034 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 531:
-#line 1856 "dhcp6_parser.yy" // lalr1.cc:859
+  case 535:
+#line 1860 "dhcp6_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); 
       }
 #line 3042 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 532:
-#line 1859 "dhcp6_parser.yy" // lalr1.cc:859
+  case 536:
+#line 1863 "dhcp6_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3050 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 533:
-#line 1862 "dhcp6_parser.yy" // lalr1.cc:859
+  case 537:
+#line 1866 "dhcp6_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3058 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 534:
-#line 1865 "dhcp6_parser.yy" // lalr1.cc:859
+  case 538:
+#line 1869 "dhcp6_parser.yy" // lalr1.cc:859
     {
       yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location)));
       }
 #line 3066 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 535:
-#line 1868 "dhcp6_parser.yy" // lalr1.cc:859
+  case 539:
+#line 1872 "dhcp6_parser.yy" // lalr1.cc:859
     {
       error(yystack_[0].location, "boolean values for the replace-client-name are "
                 "no longer supported");
@@ -3074,16 +3074,16 @@ namespace isc { namespace dhcp {
 #line 3075 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 536:
-#line 1874 "dhcp6_parser.yy" // lalr1.cc:859
+  case 540:
+#line 1878 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3083 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 537:
-#line 1876 "dhcp6_parser.yy" // lalr1.cc:859
+  case 541:
+#line 1880 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("generated-prefix", s);
@@ -3092,16 +3092,16 @@ namespace isc { namespace dhcp {
 #line 3093 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 538:
-#line 1884 "dhcp6_parser.yy" // lalr1.cc:859
+  case 542:
+#line 1888 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3101 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 539:
-#line 1886 "dhcp6_parser.yy" // lalr1.cc:859
+  case 543:
+#line 1890 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3109,16 +3109,16 @@ namespace isc { namespace dhcp {
 #line 3110 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 540:
-#line 1891 "dhcp6_parser.yy" // lalr1.cc:859
+  case 544:
+#line 1895 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3118 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 541:
-#line 1893 "dhcp6_parser.yy" // lalr1.cc:859
+  case 545:
+#line 1897 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3126,16 +3126,16 @@ namespace isc { namespace dhcp {
 #line 3127 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 542:
-#line 1898 "dhcp6_parser.yy" // lalr1.cc:859
+  case 546:
+#line 1902 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3135 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 543:
-#line 1900 "dhcp6_parser.yy" // lalr1.cc:859
+  case 547:
+#line 1904 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ());
     ctx.leave();
@@ -3143,8 +3143,8 @@ namespace isc { namespace dhcp {
 #line 3144 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 544:
-#line 1911 "dhcp6_parser.yy" // lalr1.cc:859
+  case 548:
+#line 1915 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("Logging", m);
@@ -3154,8 +3154,8 @@ namespace isc { namespace dhcp {
 #line 3155 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 545:
-#line 1916 "dhcp6_parser.yy" // lalr1.cc:859
+  case 549:
+#line 1920 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3163,8 +3163,8 @@ namespace isc { namespace dhcp {
 #line 3164 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 549:
-#line 1933 "dhcp6_parser.yy" // lalr1.cc:859
+  case 553:
+#line 1937 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("loggers", l);
@@ -3174,8 +3174,8 @@ namespace isc { namespace dhcp {
 #line 3175 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 550:
-#line 1938 "dhcp6_parser.yy" // lalr1.cc:859
+  case 554:
+#line 1942 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3183,8 +3183,8 @@ namespace isc { namespace dhcp {
 #line 3184 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 553:
-#line 1950 "dhcp6_parser.yy" // lalr1.cc:859
+  case 557:
+#line 1954 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(l);
@@ -3193,16 +3193,16 @@ namespace isc { namespace dhcp {
 #line 3194 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 554:
-#line 1954 "dhcp6_parser.yy" // lalr1.cc:859
+  case 558:
+#line 1958 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
 #line 3202 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 562:
-#line 1969 "dhcp6_parser.yy" // lalr1.cc:859
+  case 566:
+#line 1973 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("debuglevel", dl);
@@ -3210,16 +3210,16 @@ namespace isc { namespace dhcp {
 #line 3211 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 563:
-#line 1974 "dhcp6_parser.yy" // lalr1.cc:859
+  case 567:
+#line 1978 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3219 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 564:
-#line 1976 "dhcp6_parser.yy" // lalr1.cc:859
+  case 568:
+#line 1980 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("severity", sev);
@@ -3228,8 +3228,8 @@ namespace isc { namespace dhcp {
 #line 3229 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 565:
-#line 1982 "dhcp6_parser.yy" // lalr1.cc:859
+  case 569:
+#line 1986 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output_options", l);
@@ -3239,8 +3239,8 @@ namespace isc { namespace dhcp {
 #line 3240 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 566:
-#line 1987 "dhcp6_parser.yy" // lalr1.cc:859
+  case 570:
+#line 1991 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
     ctx.leave();
@@ -3248,8 +3248,8 @@ namespace isc { namespace dhcp {
 #line 3249 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 569:
-#line 1996 "dhcp6_parser.yy" // lalr1.cc:859
+  case 573:
+#line 2000 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->add(m);
@@ -3258,24 +3258,24 @@ namespace isc { namespace dhcp {
 #line 3259 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 570:
-#line 2000 "dhcp6_parser.yy" // lalr1.cc:859
+  case 574:
+#line 2004 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.stack_.pop_back();
 }
 #line 3267 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 577:
-#line 2014 "dhcp6_parser.yy" // lalr1.cc:859
+  case 581:
+#line 2018 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ctx.enter(ctx.NO_KEYWORD);
 }
 #line 3275 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 578:
-#line 2016 "dhcp6_parser.yy" // lalr1.cc:859
+  case 582:
+#line 2020 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("output", sev);
@@ -3284,8 +3284,8 @@ namespace isc { namespace dhcp {
 #line 3285 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 579:
-#line 2022 "dhcp6_parser.yy" // lalr1.cc:859
+  case 583:
+#line 2026 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("flush", flush);
@@ -3293,8 +3293,8 @@ namespace isc { namespace dhcp {
 #line 3294 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 580:
-#line 2027 "dhcp6_parser.yy" // lalr1.cc:859
+  case 584:
+#line 2031 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxsize", maxsize);
@@ -3302,8 +3302,8 @@ namespace isc { namespace dhcp {
 #line 3303 "dhcp6_parser.cc" // lalr1.cc:859
     break;
 
-  case 581:
-#line 2032 "dhcp6_parser.yy" // lalr1.cc:859
+  case 585:
+#line 2036 "dhcp6_parser.yy" // lalr1.cc:859
     {
     ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location)));
     ctx.stack_.back()->set("maxver", maxver);
@@ -3567,109 +3567,109 @@ namespace isc { namespace dhcp {
   }
 
 
-  const short int Dhcp6Parser::yypact_ninf_ = -714;
+  const short int Dhcp6Parser::yypact_ninf_ = -712;
 
   const signed char Dhcp6Parser::yytable_ninf_ = -1;
 
   const short int
   Dhcp6Parser::yypact_[] =
   {
-     249,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,    30,    31,    32,    40,    62,    79,
-     102,   108,   151,   153,   160,   162,   180,   182,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,    31,   -81,    19,   105,   328,    18,
-      16,   214,   143,   168,    88,     2,    13,   268,  -714,   218,
-     232,   277,   265,   303,  -714,  -714,  -714,  -714,  -714,   320,
-    -714,    45,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   325,   343,   345,   346,   347,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   349,
-    -714,  -714,  -714,    85,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-     350,   109,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   351,   352,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,   115,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   123,  -714,  -714,  -714,  -714,  -714,   354,  -714,   355,
-     356,  -714,  -714,  -714,  -714,   156,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   324,   358,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   357,  -714,  -714,   359,  -714,  -714,  -714,   360,  -714,
-    -714,   361,   364,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,   366,   367,  -714,  -714,
-    -714,  -714,   393,   365,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,   194,  -714,  -714,  -714,   368,  -714,
-    -714,   398,  -714,   399,   400,  -714,  -714,   401,   402,   403,
-    -714,  -714,  -714,   201,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-      31,    31,  -714,   210,   404,   405,   406,   407,   408,  -714,
-      19,  -714,   409,   410,   411,   263,   270,   273,   274,   275,
-     417,   418,   420,   421,   425,   426,   427,   428,   430,   431,
-     432,   433,   434,   286,   436,   437,   105,  -714,   438,   289,
-     328,  -714,    56,   439,   441,   442,   443,   444,   296,   295,
-     447,   448,   449,   450,    18,  -714,   451,    16,  -714,   452,
-     306,   456,   308,   309,   214,  -714,   459,   460,   463,   464,
-     465,   466,   467,  -714,   143,  -714,   468,   469,   321,   471,
-     472,   473,   323,  -714,    88,   477,   329,   330,  -714,     2,
-     479,   482,   177,  -714,   333,   485,   486,   338,   488,   340,
-     341,   491,   492,   342,   348,   353,   494,   497,   268,  -714,
-    -714,  -714,   498,   499,   500,    31,    31,    31,  -714,   502,
-     503,   504,  -714,  -714,  -714,  -714,  -714,   507,   508,   509,
-     510,    31,   513,   514,   515,   516,   517,   518,   519,   520,
-    -714,   521,   522,  -714,   525,  -714,  -714,  -714,  -714,  -714,
-    -714,   496,   512,  -714,  -714,  -714,   526,   527,   372,   373,
-     381,  -714,  -714,   228,   382,   530,   529,  -714,   385,  -714,
-     386,  -714,   387,  -714,  -714,  -714,   525,   525,   525,   388,
-     389,   390,   391,  -714,   392,   394,  -714,   395,   396,   397,
-    -714,  -714,   412,  -714,  -714,  -714,   413,    31,  -714,  -714,
-     414,   415,  -714,   416,  -714,  -714,   222,   383,  -714,  -714,
-    -714,    27,   419,  -714,    31,   105,   422,  -714,  -714,  -714,
-     328,   221,   221,   538,   544,   545,  -714,  -714,  -714,   546,
-     -46,    31,   135,    48,   547,   139,    80,   241,   268,  -714,
-    -714,   551,  -714,    56,   549,   550,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,   552,   476,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   208,
-    -714,   230,  -714,  -714,   231,  -714,  -714,  -714,  -714,   556,
-     557,   558,   559,   565,  -714,  -714,  -714,   255,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   256,  -714,   564,   569,  -714,  -714,   567,   571,  -714,
-    -714,   570,   572,  -714,  -714,   573,   574,  -714,  -714,  -714,
-      54,  -714,  -714,  -714,   575,  -714,  -714,  -714,    64,  -714,
-    -714,  -714,  -714,   119,  -714,   576,   577,  -714,   579,   580,
-     581,   582,   583,   584,   269,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,   585,   586,   587,  -714,  -714,   271,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   272,  -714,
-    -714,  -714,   279,   440,   445,  -714,  -714,   588,   590,  -714,
-    -714,   589,   593,  -714,  -714,   592,   596,  -714,  -714,   594,
-    -714,   597,   422,  -714,  -714,   599,   600,   601,   602,   454,
-     423,   455,   457,   458,   605,   606,   221,  -714,  -714,    18,
-    -714,   538,    88,  -714,   544,     2,  -714,   545,    51,  -714,
-     546,   -46,  -714,  -714,   135,  -714,    48,  -714,    13,  -714,
-     547,   461,   462,   470,   474,   475,   478,   139,  -714,   609,
-     612,   480,   481,   483,    80,  -714,   613,   614,   241,  -714,
-    -714,  -714,   615,   616,  -714,    16,  -714,   549,   214,  -714,
-     550,   143,  -714,   552,   618,  -714,   595,  -714,    83,   487,
-     489,   490,  -714,  -714,  -714,  -714,  -714,   493,   495,  -714,
-     280,  -714,   617,  -714,   621,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   281,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   282,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,    53,   501,  -714,
-    -714,  -714,  -714,   505,   506,  -714,  -714,   511,   288,  -714,
-     297,  -714,   622,  -714,   523,   619,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,    51,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,   307,  -714,  -714,   124,   619,
-    -714,  -714,   620,  -714,  -714,  -714,   301,  -714,  -714,  -714,
-    -714,  -714,   628,   484,   631,   124,  -714,   633,  -714,   528,
-    -714,   636,  -714,  -714,   314,  -714,    66,   636,  -714,  -714,
-     640,   642,   644,   304,  -714,  -714,  -714,  -714,  -714,  -714,
-     645,   532,   524,   535,    66,  -714,   531,  -714,  -714,  -714,
-    -714,  -714
+     242,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,    31,    21,    30,    39,    45,    73,
+      94,    98,   109,   120,   128,   131,   135,   142,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,    21,   -29,    10,   149,   184,    25,
+     174,    15,   123,   153,    87,   204,   -30,   261,  -712,   134,
+     208,   203,   207,   221,  -712,  -712,  -712,  -712,  -712,   222,
+    -712,    92,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   224,   230,   237,   245,   251,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,   255,
+    -712,  -712,  -712,    99,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+     266,   101,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   272,   301,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,   116,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   122,  -712,  -712,  -712,  -712,  -712,   321,  -712,   325,
+     338,  -712,  -712,  -712,  -712,   133,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   299,   284,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   345,  -712,  -712,   342,  -712,  -712,  -712,   400,  -712,
+    -712,   397,   306,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,   402,   403,  -712,  -712,
+    -712,  -712,   401,   405,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,   205,  -712,  -712,  -712,
+     406,  -712,  -712,   407,  -712,   408,   410,  -712,  -712,   411,
+     412,   413,  -712,  -712,  -712,   206,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,    21,    21,  -712,   267,   414,   416,   417,   418,
+     419,  -712,    10,  -712,   420,   421,   422,   276,   277,   278,
+     281,   287,   423,   424,   428,   429,   431,   435,   437,   438,
+     439,   440,   441,   442,   443,   295,   445,   446,   149,  -712,
+     447,   298,   184,  -712,   132,   450,   451,   452,   453,   454,
+     307,   308,   455,   460,   461,   462,    25,  -712,   463,   174,
+    -712,   464,   318,   468,   322,   323,    15,  -712,   469,   470,
+     473,   474,   475,   476,   477,  -712,   123,  -712,   478,   481,
+     334,   484,   485,   486,   337,  -712,    87,   489,   339,   340,
+    -712,   204,   492,   493,   279,  -712,   343,   495,   496,   348,
+     498,   350,   351,   502,   503,   353,   354,   355,   507,   508,
+     261,  -712,  -712,  -712,   509,   510,   511,    21,    21,    21,
+    -712,   512,   514,   516,  -712,  -712,  -712,  -712,  -712,   519,
+     520,   521,   522,    21,   523,   525,   526,   527,   528,   529,
+     531,   532,  -712,   533,   534,  -712,   530,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,   506,   513,  -712,  -712,  -712,
+     537,   538,   363,   375,   392,  -712,  -712,   231,   393,   541,
+     540,  -712,   396,  -712,   398,  -712,   399,  -712,  -712,  -712,
+     530,   530,   530,   404,   409,   415,   425,  -712,   426,   427,
+    -712,   430,   432,   433,  -712,  -712,   434,  -712,  -712,  -712,
+     436,    21,  -712,  -712,   444,   448,  -712,   449,  -712,  -712,
+     195,   458,  -712,  -712,  -712,   -81,   456,  -712,    21,   149,
+     459,  -712,  -712,  -712,   184,   129,   129,   542,   545,   546,
+    -712,  -712,  -712,   547,   -44,    21,   280,    20,   548,   175,
+      13,   292,   261,  -712,  -712,   553,  -712,   132,   551,   552,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,   555,   482,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,   219,  -712,   249,  -712,  -712,   250,  -712,
+    -712,  -712,  -712,   556,   559,   561,   562,   564,  -712,  -712,
+    -712,   265,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,   271,  -712,   563,   567,  -712,
+    -712,   565,   569,  -712,  -712,   568,   570,  -712,  -712,   575,
+     572,  -712,  -712,  -712,   163,  -712,  -712,  -712,   577,  -712,
+    -712,  -712,   333,  -712,  -712,  -712,  -712,   344,  -712,   583,
+     573,  -712,   586,   587,   588,   589,   590,   591,   274,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,   593,   594,
+     595,  -712,  -712,   275,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,   282,  -712,  -712,  -712,   283,   457,   465,  -712,
+    -712,   596,   600,  -712,  -712,   598,   602,  -712,  -712,   601,
+     603,  -712,  -712,   604,  -712,   606,   459,  -712,  -712,   607,
+     609,   610,   611,   466,   467,   471,   472,   479,   612,   614,
+     129,  -712,  -712,    25,  -712,   542,    87,  -712,   545,   204,
+    -712,   546,    58,  -712,   547,   -44,  -712,  -712,   280,  -712,
+      20,  -712,   -30,  -712,   548,   480,   483,   487,   488,   490,
+     491,   175,  -712,   616,   617,   494,   497,   499,    13,  -712,
+     619,   621,   292,  -712,  -712,  -712,   620,   625,  -712,   174,
+    -712,   551,    15,  -712,   552,   123,  -712,   555,   626,  -712,
+     624,  -712,    59,   501,   504,   505,  -712,  -712,  -712,  -712,
+    -712,   515,   517,  -712,   286,  -712,   623,  -712,   627,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,   290,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,   303,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   304,   518,  -712,  -712,  -712,  -712,   535,   549,  -712,
+    -712,   550,   305,  -712,   320,  -712,   629,  -712,   554,   631,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,    58,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,   356,
+    -712,  -712,   140,   631,  -712,  -712,   630,  -712,  -712,  -712,
+     329,  -712,  -712,  -712,  -712,  -712,   635,   539,   638,   140,
+    -712,   640,  -712,   557,  -712,   639,  -712,  -712,   391,  -712,
+     103,   639,  -712,  -712,   644,   645,   647,   335,  -712,  -712,
+    -712,  -712,  -712,  -712,   650,   500,   560,   566,   103,  -712,
+     558,  -712,  -712,  -712,  -712,  -712
   };
 
   const unsigned short int
@@ -3679,358 +3679,362 @@ namespace isc { namespace dhcp {
       20,    22,    24,    26,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     1,    43,
       36,    32,    31,    28,    29,    30,    35,     3,    33,    34,
-      56,     5,    68,     7,   104,     9,   217,    11,   356,    13,
-     379,    15,   407,    17,   283,    19,   291,    21,   328,    23,
-     182,    25,   491,    27,    45,    39,     0,     0,     0,     0,
-       0,     0,   409,     0,   293,   330,     0,     0,    47,     0,
-      46,     0,     0,    40,    66,   544,   538,   540,   542,     0,
+      56,     5,    68,     7,   104,     9,   217,    11,   358,    13,
+     381,    15,   409,    17,   283,    19,   291,    21,   328,    23,
+     182,    25,   495,    27,    45,    39,     0,     0,     0,     0,
+       0,     0,   411,     0,   293,   330,     0,     0,    47,     0,
+      46,     0,     0,    40,    66,   548,   542,   544,   546,     0,
       65,     0,    58,    60,    62,    63,    64,    61,   102,   113,
-     115,     0,     0,     0,     0,     0,   209,   281,   320,   367,
-     369,   255,   155,   172,   163,   440,   174,   193,   457,     0,
-     479,   489,    96,     0,    70,    72,    73,    74,    75,    76,
+     115,     0,     0,     0,     0,     0,   209,   281,   320,   369,
+     371,   255,   155,   172,   163,   442,   174,   193,   461,     0,
+     483,   493,    96,     0,    70,    72,    73,    74,    75,    76,
       79,    80,    81,    82,    84,    83,    88,    89,    77,    78,
       86,    87,    94,    95,    85,    90,    91,    92,    93,   110,
-       0,     0,   106,   108,   109,   444,   348,   371,   240,   242,
-     244,     0,     0,   248,   246,   399,   436,   239,   221,   222,
+       0,     0,   106,   108,   109,   446,   350,   373,   240,   242,
+     244,     0,     0,   248,   246,   401,   438,   239,   221,   222,
      223,   224,     0,   219,   228,   229,   230,   233,   235,   231,
-     232,   225,   226,   237,   238,   227,   234,   236,   365,   364,
-     361,     0,   358,   360,   362,   363,   392,     0,   395,     0,
-       0,   391,   386,   389,   390,     0,   381,   383,   384,   387,
-     388,   385,   434,   422,   424,   426,   428,   430,   432,   421,
-     420,     0,   410,   411,   415,   416,   413,   417,   418,   419,
-     414,     0,   310,   145,     0,   314,   312,   317,     0,   306,
+     232,   225,   226,   237,   238,   227,   234,   236,   367,   366,
+     363,     0,   360,   362,   364,   365,   394,     0,   397,     0,
+       0,   393,   388,   391,   392,     0,   383,   385,   386,   389,
+     390,   387,   436,   424,   426,   428,   430,   432,   434,   423,
+     422,     0,   412,   413,   417,   418,   415,   419,   420,   421,
+     416,     0,   310,   145,     0,   314,   312,   317,     0,   306,
      307,     0,   294,   295,   297,   309,   298,   299,   300,   316,
-     301,   302,   303,   304,   305,   342,     0,     0,   340,   341,
-     344,   345,     0,   331,   332,   334,   335,   336,   337,   338,
-     339,   189,   191,   186,     0,   184,   187,   188,     0,   511,
-     513,     0,   516,     0,     0,   520,   524,     0,     0,     0,
-     529,   536,   509,     0,   493,   495,   496,   497,   498,   499,
-     500,   501,   502,   503,   504,   505,   506,   507,   508,    44,
-       0,     0,    37,     0,     0,     0,     0,     0,     0,    55,
-       0,    57,     0,     0,     0,     0,     0,     0,     0,     0,
+     301,   302,   303,   304,   305,   344,     0,     0,   342,   343,
+     346,   347,     0,   331,   332,   334,   335,   336,   337,   338,
+     339,   340,   341,   189,   191,   186,     0,   184,   187,   188,
+       0,   515,   517,     0,   520,     0,     0,   524,   528,     0,
+       0,     0,   533,   540,   513,     0,   497,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,   510,   511,
+     512,    44,     0,     0,    37,     0,     0,     0,     0,     0,
+       0,    55,     0,    57,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    69,
+       0,     0,     0,   105,   448,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   218,     0,     0,
+     359,     0,     0,     0,     0,     0,     0,   382,     0,     0,
+       0,     0,     0,     0,     0,   410,     0,   284,     0,     0,
+       0,     0,     0,     0,     0,   292,     0,     0,     0,     0,
+     329,     0,     0,     0,     0,   183,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    69,     0,     0,
-       0,   105,   446,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   218,     0,     0,   357,     0,
-       0,     0,     0,     0,     0,   380,     0,     0,     0,     0,
-       0,     0,     0,   408,     0,   284,     0,     0,     0,     0,
-       0,     0,     0,   292,     0,     0,     0,     0,   329,     0,
-       0,     0,     0,   183,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   492,
-      48,    41,     0,     0,     0,     0,     0,     0,    59,     0,
-       0,     0,    97,    98,    99,   100,   101,     0,     0,     0,
+       0,   496,    48,    41,     0,     0,     0,     0,     0,     0,
+      59,     0,     0,     0,    97,    98,    99,   100,   101,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     478,     0,     0,    71,     0,   112,   107,   455,   453,   454,
-     452,     0,   447,   448,   450,   451,     0,     0,     0,     0,
-       0,   253,   254,     0,     0,     0,     0,   220,     0,   359,
-       0,   394,     0,   397,   398,   382,     0,     0,     0,     0,
-       0,     0,     0,   412,     0,     0,   308,     0,     0,     0,
-     319,   296,     0,   346,   347,   333,     0,     0,   185,   510,
-       0,     0,   515,     0,   518,   519,     0,     0,   526,   527,
-     528,     0,     0,   494,     0,     0,     0,   539,   541,   543,
-       0,     0,     0,   211,   285,   322,    38,   368,   370,   257,
-       0,    45,     0,     0,   176,     0,     0,     0,     0,    49,
-     111,     0,   445,     0,   350,   373,   241,   243,   245,   250,
-     251,   252,   249,   247,   401,     0,   366,   393,   396,   435,
-     423,   425,   427,   429,   431,   433,   311,   146,   315,   313,
-     318,   343,   190,   192,   512,   514,   517,   522,   523,   521,
-     525,   531,   532,   533,   534,   535,   530,   537,    42,     0,
-     549,     0,   546,   548,     0,   132,   138,   140,   142,     0,
-       0,     0,     0,     0,   151,   153,   131,     0,   117,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,     0,   215,     0,   212,   213,   289,     0,   286,   287,
-     326,     0,   323,   324,   261,     0,   258,   259,   161,   162,
-       0,   157,   159,   160,     0,   170,   171,   167,     0,   165,
-     168,   169,   442,     0,   180,     0,   177,   178,     0,     0,
-       0,     0,     0,     0,     0,   195,   197,   198,   199,   200,
-     201,   202,   468,   474,     0,     0,     0,   467,   466,     0,
-     459,   461,   464,   462,   463,   465,   485,   487,     0,   481,
-     483,   484,     0,    51,     0,   449,   354,     0,   351,   352,
-     377,     0,   374,   375,   405,     0,   402,   403,   438,     0,
-      67,     0,     0,   545,   103,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   114,   116,     0,
-     210,     0,   293,   282,     0,   330,   321,     0,     0,   256,
-       0,     0,   156,   173,     0,   164,     0,   441,     0,   175,
-       0,     0,     0,     0,     0,     0,     0,     0,   194,     0,
-       0,     0,     0,     0,     0,   458,     0,     0,     0,   480,
-     490,    53,     0,    52,   456,     0,   349,     0,     0,   372,
-       0,   409,   400,     0,     0,   437,     0,   547,     0,     0,
-       0,     0,   144,   147,   148,   149,   150,     0,     0,   118,
-       0,   214,     0,   288,     0,   325,   280,   275,   277,   269,
-     270,   265,   266,   267,   268,   274,   273,   276,     0,   263,
-     271,   278,   279,   272,   260,   158,   166,   443,     0,   179,
-     203,   204,   205,   206,   207,   208,   196,     0,     0,   473,
-     476,   477,   460,     0,     0,   482,    50,     0,     0,   353,
-       0,   376,     0,   404,     0,     0,   134,   135,   136,   137,
-     133,   139,   141,   143,   152,   154,   216,   290,   327,     0,
-     262,   181,   470,   471,   472,   469,   475,   486,   488,    54,
-     355,   378,   406,   439,   553,     0,   551,   264,     0,     0,
-     550,   565,     0,   563,   561,   557,     0,   555,   559,   560,
-     558,   552,     0,     0,     0,     0,   554,     0,   562,     0,
-     556,     0,   564,   569,     0,   567,     0,     0,   566,   577,
-       0,     0,     0,     0,   571,   573,   574,   575,   576,   568,
-       0,     0,     0,     0,     0,   570,     0,   579,   580,   581,
-     572,   578
+       0,     0,   482,     0,     0,    71,     0,   112,   107,   459,
+     457,   458,   454,   455,   456,     0,   449,   450,   452,   453,
+       0,     0,     0,     0,     0,   253,   254,     0,     0,     0,
+       0,   220,     0,   361,     0,   396,     0,   399,   400,   384,
+       0,     0,     0,     0,     0,     0,     0,   414,     0,     0,
+     308,     0,     0,     0,   319,   296,     0,   348,   349,   333,
+       0,     0,   185,   514,     0,     0,   519,     0,   522,   523,
+       0,     0,   530,   531,   532,     0,     0,   498,     0,     0,
+       0,   543,   545,   547,     0,     0,     0,   211,   285,   322,
+      38,   370,   372,   257,     0,    45,     0,     0,   176,     0,
+       0,     0,     0,    49,   111,     0,   447,     0,   352,   375,
+     241,   243,   245,   250,   251,   252,   249,   247,   403,     0,
+     368,   395,   398,   437,   425,   427,   429,   431,   433,   435,
+     311,   146,   315,   313,   318,   345,   190,   192,   516,   518,
+     521,   526,   527,   525,   529,   535,   536,   537,   538,   539,
+     534,   541,    42,     0,   553,     0,   550,   552,     0,   132,
+     138,   140,   142,     0,     0,     0,     0,     0,   151,   153,
+     131,     0,   117,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,     0,   215,     0,   212,   213,
+     289,     0,   286,   287,   326,     0,   323,   324,   261,     0,
+     258,   259,   161,   162,     0,   157,   159,   160,     0,   170,
+     171,   167,     0,   165,   168,   169,   444,     0,   180,     0,
+     177,   178,     0,     0,     0,     0,     0,     0,     0,   195,
+     197,   198,   199,   200,   201,   202,   472,   478,     0,     0,
+       0,   471,   470,     0,   463,   465,   468,   466,   467,   469,
+     489,   491,     0,   485,   487,   488,     0,    51,     0,   451,
+     356,     0,   353,   354,   379,     0,   376,   377,   407,     0,
+     404,   405,   440,     0,    67,     0,     0,   549,   103,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   114,   116,     0,   210,     0,   293,   282,     0,   330,
+     321,     0,     0,   256,     0,     0,   156,   173,     0,   164,
+       0,   443,     0,   175,     0,     0,     0,     0,     0,     0,
+       0,     0,   194,     0,     0,     0,     0,     0,     0,   462,
+       0,     0,     0,   484,   494,    53,     0,    52,   460,     0,
+     351,     0,     0,   374,     0,   411,   402,     0,     0,   439,
+       0,   551,     0,     0,     0,     0,   144,   147,   148,   149,
+     150,     0,     0,   118,     0,   214,     0,   288,     0,   325,
+     280,   275,   277,   269,   270,   265,   266,   267,   268,   274,
+     273,   276,     0,   263,   271,   278,   279,   272,   260,   158,
+     166,   445,     0,   179,   203,   204,   205,   206,   207,   208,
+     196,     0,     0,   477,   480,   481,   464,     0,     0,   486,
+      50,     0,     0,   355,     0,   378,     0,   406,     0,     0,
+     134,   135,   136,   137,   133,   139,   141,   143,   152,   154,
+     216,   290,   327,     0,   262,   181,   474,   475,   476,   473,
+     479,   490,   492,    54,   357,   380,   408,   441,   557,     0,
+     555,   264,     0,     0,   554,   569,     0,   567,   565,   561,
+       0,   559,   563,   564,   562,   556,     0,     0,     0,     0,
+     558,     0,   566,     0,   560,     0,   568,   573,     0,   571,
+       0,     0,   570,   581,     0,     0,     0,     0,   575,   577,
+     578,   579,   580,   572,     0,     0,     0,     0,     0,   574,
+       0,   583,   584,   585,   576,   582
   };
 
   const short int
   Dhcp6Parser::yypgoto_[] =
   {
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,    -8,  -714,   200,  -714,  -714,
-    -714,  -714,  -714,  -714,   110,  -714,  -152,  -714,  -714,  -714,
-     -66,  -714,  -714,  -714,   300,  -714,  -714,  -714,  -714,   125,
-     310,   -67,   -49,   -42,   -41,  -714,  -714,  -714,  -714,  -714,
-     122,   305,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   127,
-     -82,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   -74,  -714,  -533,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,   -91,  -518,  -714,  -714,  -714,  -714,
-     -93,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   -96,
-    -714,  -714,  -714,   -92,   266,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -102,  -714,  -714,  -714,  -714,  -714,  -714,  -713,
-    -714,  -714,  -714,   -72,  -714,  -714,  -714,   -50,   332,  -714,
-    -714,  -689,  -714,  -687,  -714,  -531,  -714,  -686,  -714,  -714,
-    -714,  -685,  -714,  -714,  -714,  -714,   -83,  -714,  -714,  -201,
-     630,  -714,  -714,  -714,  -714,  -714,   -51,  -714,  -714,  -714,
-     -38,  -714,   315,  -714,   -61,  -714,  -714,  -714,  -714,  -714,
-     -60,  -714,  -714,  -714,  -714,  -714,   -53,  -714,  -714,  -714,
-     -35,  -714,  -714,  -714,   -44,  -714,   311,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,   -73,  -714,
-    -714,  -714,   -70,   362,  -714,  -714,   -48,  -714,   -37,  -714,
-    -714,  -714,  -714,  -714,   -77,  -714,  -714,  -714,   -71,   344,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   -69,  -714,  -714,  -714,   -75,  -714,   336,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -684,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,   170,  -714,  -714,  -714,  -714,  -714,  -714,   -47,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,   -57,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,   178,   312,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,  -714,
-    -714,  -714,  -714,  -714,  -714,     6,  -714,  -714,  -714,  -168,
-    -714,  -714,  -182,  -714,  -714,  -714,  -714,  -714,  -714,  -193,
-    -714,  -714,  -208,  -714,  -714,  -714,  -714,  -714
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,     9,  -712,   216,  -712,  -712,
+    -712,  -712,  -712,  -712,   114,  -712,   -89,  -712,  -712,  -712,
+     -66,  -712,  -712,  -712,   341,  -712,  -712,  -712,  -712,   136,
+     312,   -67,   -62,   -54,   -48,  -712,  -712,  -712,  -712,  -712,
+     127,   310,  -712,  -712,  -712,  -712,  -712,  -712,  -712,   137,
+     -76,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   -74,  -712,  -538,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,   -87,  -533,  -712,  -712,  -712,  -712,
+     -86,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,   -93,
+    -712,  -712,  -712,   -83,   289,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,   -68,  -712,  -712,  -712,  -712,  -712,  -712,  -711,
+    -712,  -712,  -712,   -63,  -712,  -712,  -712,   -59,   349,  -712,
+    -712,  -705,  -712,  -692,  -712,  -531,  -712,  -691,  -712,  -712,
+    -712,  -690,  -712,  -712,  -712,  -712,   -49,  -712,  -712,  -176,
+     643,  -712,  -712,  -712,  -712,  -712,   -28,  -712,  -712,  -712,
+     -25,  -712,   328,  -712,   -61,  -712,  -712,  -712,  -712,  -712,
+     -50,  -712,  -712,  -712,  -712,  -712,   -21,  -712,  -712,  -712,
+     -33,  -712,  -712,  -712,   -24,  -712,   326,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,   -58,  -712,
+    -712,  -712,   -57,   359,  -712,  -712,   -52,  -712,   -35,  -712,
+    -712,  -712,  -712,  -712,   -64,  -712,  -712,  -712,   -56,   358,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   -55,  -712,  -712,  -712,   -60,  -712,   352,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -688,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,   182,  -712,  -712,  -712,  -712,  -712,  -712,   -37,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,   -39,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,   192,   327,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,  -712,
+    -712,  -712,  -712,  -712,  -712,    19,  -712,  -712,  -712,  -157,
+    -712,  -712,  -171,  -712,  -712,  -712,  -712,  -712,  -712,  -182,
+    -712,  -712,  -198,  -712,  -712,  -712,  -712,  -712
   };
 
   const short int
   Dhcp6Parser::yydefgoto_[] =
   {
       -1,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    78,    37,    38,    65,   537,
-      82,    83,    39,    64,    79,    80,   550,   703,   782,   783,
-     122,    41,    66,    91,    92,    93,   314,    43,    67,   123,
-     124,   125,   126,   127,   128,   129,   130,   322,    45,    68,
-     151,   152,   153,   348,   154,   131,   323,   132,   324,   617,
-     618,   619,   725,   870,   620,   726,   621,   727,   622,   728,
-     623,   240,   387,   625,   626,   627,   628,   629,   734,   630,
-     735,   133,   336,   650,   651,   652,   653,   134,   338,   658,
-     659,   660,   661,   135,   337,   136,   340,   665,   666,   667,
-     758,    61,    76,   274,   275,   276,   400,   277,   401,   137,
-     341,   674,   675,   676,   677,   678,   679,   680,   681,   138,
-     330,   633,   634,   635,   739,    47,    69,   172,   173,   174,
-     355,   175,   356,   176,   357,   177,   361,   178,   360,   562,
-     179,   180,   139,   335,   645,   646,   647,   748,   828,   829,
-     140,   331,    55,    73,   637,   638,   639,   742,    57,    74,
-     241,   242,   243,   244,   245,   246,   247,   386,   248,   390,
-     249,   389,   250,   251,   391,   252,   141,   332,   641,   642,
-     643,   745,    59,    75,   262,   263,   264,   265,   266,   395,
-     267,   268,   269,   270,   182,   353,   707,   708,   709,   785,
-      49,    70,   191,   192,   193,   366,   142,   333,   143,   334,
-     185,   354,   711,   712,   713,   788,    51,    71,   205,   206,
-     207,   369,   208,   209,   371,   210,   211,   186,   362,   715,
-     716,   717,   791,    53,    72,   221,   222,   223,   224,   377,
-     225,   378,   226,   379,   227,   380,   228,   381,   229,   382,
-     230,   376,   187,   363,   719,   794,   144,   339,   663,   352,
-     461,   462,   463,   464,   465,   551,   145,   342,   689,   690,
-     691,   769,   885,   692,   693,   770,   694,   695,   146,   147,
-     344,   698,   699,   700,   776,   701,   777,   148,   345,    63,
-      77,   293,   294,   295,   296,   405,   297,   406,   298,   299,
-     408,   300,   301,   302,   411,   589,   303,   412,   304,   305,
-     306,   307,   416,   596,   308,   417,    94,   316,    95,   317,
-      96,   318,    97,   315,   601,   602,   603,   721,   895,   896,
-     898,   906,   907,   908,   909,   914,   910,   912,   924,   925,
-     926,   933,   934,   935,   940,   936,   937,   938
+      23,    24,    25,    26,    27,    78,    37,    38,    65,   541,
+      82,    83,    39,    64,    79,    80,   554,   707,   786,   787,
+     122,    41,    66,    91,    92,    93,   316,    43,    67,   123,
+     124,   125,   126,   127,   128,   129,   130,   324,    45,    68,
+     151,   152,   153,   350,   154,   131,   325,   132,   326,   621,
+     622,   623,   729,   874,   624,   730,   625,   731,   626,   732,
+     627,   240,   389,   629,   630,   631,   632,   633,   738,   634,
+     739,   133,   338,   654,   655,   656,   657,   134,   340,   662,
+     663,   664,   665,   135,   339,   136,   342,   669,   670,   671,
+     762,    61,    76,   276,   277,   278,   402,   279,   403,   137,
+     343,   678,   679,   680,   681,   682,   683,   684,   685,   138,
+     332,   637,   638,   639,   743,    47,    69,   172,   173,   174,
+     357,   175,   358,   176,   359,   177,   363,   178,   362,   566,
+     179,   180,   139,   337,   649,   650,   651,   752,   832,   833,
+     140,   333,    55,    73,   641,   642,   643,   746,    57,    74,
+     241,   242,   243,   244,   245,   246,   247,   388,   248,   392,
+     249,   391,   250,   251,   393,   252,   141,   334,   645,   646,
+     647,   749,    59,    75,   262,   263,   264,   265,   266,   397,
+     267,   268,   269,   270,   182,   355,   711,   712,   713,   789,
+      49,    70,   191,   192,   193,   368,   142,   335,   143,   336,
+     185,   356,   715,   716,   717,   792,    51,    71,   205,   206,
+     207,   371,   208,   209,   373,   210,   211,   186,   364,   719,
+     720,   721,   795,    53,    72,   221,   222,   223,   224,   379,
+     225,   380,   226,   381,   227,   382,   228,   383,   229,   384,
+     230,   378,   187,   365,   723,   798,   144,   341,   667,   354,
+     465,   466,   467,   468,   469,   555,   145,   344,   693,   694,
+     695,   773,   889,   696,   697,   774,   698,   699,   146,   147,
+     346,   702,   703,   704,   780,   705,   781,   148,   347,    63,
+      77,   295,   296,   297,   298,   407,   299,   408,   300,   301,
+     410,   302,   303,   304,   413,   593,   305,   414,   306,   307,
+     308,   309,   418,   600,   310,   419,    94,   318,    95,   319,
+      96,   320,    97,   317,   605,   606,   607,   725,   899,   900,
+     902,   910,   911,   912,   913,   918,   914,   916,   928,   929,
+     930,   937,   938,   939,   944,   940,   941,   942
   };
 
   const unsigned short int
   Dhcp6Parser::yytable_[] =
   {
-      90,   259,   168,   167,   189,   201,   219,    36,   239,   258,
-     273,   292,   662,   688,   260,   261,   181,   190,   202,   220,
-     169,   183,   194,   203,   657,   155,   253,   170,   171,    84,
-      28,   648,   184,   195,   204,   822,    29,   254,    30,    40,
-      31,   233,   255,   234,   235,   256,   257,    42,   320,   101,
-     102,   103,   104,   321,   108,   155,   108,   751,   155,   823,
-     752,   824,   826,   827,   833,   188,   156,   754,   157,    44,
-     755,    81,   109,   110,   109,   110,   158,   159,   160,   161,
-     162,   163,   101,   102,   103,   104,    46,   106,   346,   108,
-     233,   164,   165,   347,   108,   233,   682,   271,   272,   166,
-     866,   867,   868,   869,   232,   610,   649,   109,   110,    48,
-     159,   160,   350,   162,   163,    50,    98,   351,   364,    99,
-     100,   164,   756,   365,   164,   757,   367,   233,   457,   234,
-     235,   368,   166,   236,   237,   238,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,    85,   882,   883,   884,
-     591,   592,   593,   594,    89,    86,    87,    88,    52,   374,
-      54,   109,   110,   233,   375,    89,   822,    56,    89,    58,
-      89,    89,   111,   112,   113,   114,   115,   683,   684,   685,
-     686,   108,   595,    32,    33,    34,    35,    60,   116,    62,
-     823,   117,   824,   826,   827,   833,   929,   402,   118,   930,
-     931,   932,   403,    89,   418,   107,   119,   120,    89,   419,
-     121,   346,   648,   655,   212,   656,   720,   825,   213,   214,
-     215,   216,   217,   218,   309,   837,   668,   669,   670,   671,
-     672,   673,    89,   722,   350,   310,   657,   605,   723,   724,
-      89,   688,   606,   607,   608,   609,   610,   611,   612,   613,
-     614,   615,   108,   901,    90,   902,   903,    89,   736,   736,
-     233,   271,   272,   737,   738,   196,   197,   198,   199,   200,
-     109,   110,   767,   312,   774,   778,    89,   768,   459,   775,
-     779,   311,   418,   364,   879,   402,   458,   780,   876,   880,
-     881,   367,   559,   560,   561,    89,   890,   168,   167,   460,
-     374,   189,   420,   421,   915,   891,   313,   944,   201,   916,
-     899,   181,   945,   900,   190,   169,   183,   927,   219,   194,
-     928,   202,   170,   171,   319,   259,   203,   184,   239,   325,
-     195,   220,   383,   258,   569,   570,   571,   204,   260,   261,
-     149,   150,   587,   588,   696,   697,   253,   326,   825,   327,
-     328,   329,   292,   343,   349,   358,   359,   254,   370,   372,
-     373,   384,   422,   388,   392,   385,    89,   394,   399,   393,
-     396,   397,   404,    89,   278,   279,   280,   281,   282,   283,
-     284,   285,   286,   287,   288,   289,   290,   291,     1,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,   398,   407,   409,   410,   413,   414,   415,   423,   424,
-     425,   426,   427,   429,   430,   431,   432,   527,   528,   529,
-      89,   437,   438,   433,   439,   440,   434,   435,   436,   441,
-     442,   443,   444,   538,   445,   446,   447,   448,   449,   450,
-     451,   452,   454,   466,   455,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   478,   480,   624,   624,   481,
-     482,   483,   484,   486,   487,   616,   616,   488,   489,   490,
-     491,   492,   494,   495,   496,   497,   498,   499,   500,   459,
-     687,   502,   292,   506,   503,   504,   507,   458,   509,   510,
-     511,   512,   513,   514,   515,   516,   517,   518,   521,   583,
-     460,   522,   524,   519,   552,   590,   525,   526,   520,   530,
-     531,   532,   533,   534,   535,   553,   598,    30,   539,   540,
-     541,   542,   543,   544,   556,   557,   545,   546,   547,   548,
-     549,   554,   555,   558,   563,   564,   565,   566,   567,   568,
-     572,   573,   574,   575,   576,   632,   577,   578,   579,   580,
-     600,   636,   640,   644,   664,   704,   706,   710,   718,   714,
-     729,   730,   731,   732,   581,   582,   584,   585,   586,   733,
-     740,   597,   741,   743,   744,   747,   746,   750,   803,   749,
-     760,   753,   759,   761,   762,   763,   764,   765,   766,   771,
-     772,   773,   781,   787,   786,   789,   790,   784,   792,   793,
-     865,   796,   795,   798,   799,   800,   801,   802,   804,   807,
-     808,   806,   805,   847,   840,   841,   848,   853,   854,   857,
-     428,   856,   864,   842,   913,   877,   894,   843,   844,   878,
-     892,   845,   917,   849,   850,   919,   851,   918,   921,   871,
-     536,   872,   873,   923,   941,   874,   942,   875,   943,   946,
-     599,   654,   604,   886,   809,   456,   453,   887,   888,   631,
-     835,   836,   624,   889,   839,   846,   838,   834,   508,   811,
-     616,   259,   168,   167,   821,   893,   239,   948,   897,   258,
-     922,   817,   816,   951,   260,   261,   181,   947,   949,   810,
-     169,   183,   273,   813,   253,   830,   477,   170,   171,   818,
-     831,   814,   184,   231,   812,   254,   819,   820,   687,   501,
-     505,   832,   815,   861,   859,   858,   862,   860,   485,   189,
-     493,   855,   201,   705,   863,   219,   702,   852,   797,   479,
-     523,   911,   190,   920,   939,   202,   950,   194,   220,     0,
-     203,     0,     0,     0,     0,     0,     0,     0,   195,     0,
-       0,   204,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      90,   259,   168,   167,   189,   201,   219,   169,   239,   258,
+     275,   294,   692,   661,   260,   170,   666,   183,   194,   203,
+      84,   171,   253,   271,    36,   261,    29,   155,    30,   686,
+      31,    28,   155,   652,   184,   195,   204,    40,   614,   254,
+     272,   826,   595,   596,   597,   598,    42,   827,   181,   190,
+     202,   220,    44,   108,   273,   274,   101,   102,   103,   104,
+     828,   830,   831,   108,   837,   155,   196,   197,   198,   199,
+     200,   109,   110,   156,   599,   157,   870,   871,   872,   873,
+      46,   109,   110,   158,   159,   160,   161,   162,   163,   101,
+     102,   103,   104,   164,   106,   322,   108,   233,   164,   165,
+     323,    48,   348,   232,   352,    50,   166,   349,   653,   353,
+     687,   688,   689,   690,   109,   110,    52,   159,   160,   366,
+     162,   163,    89,    81,   367,   369,   233,    54,   234,   235,
+     370,   164,   236,   237,   238,    56,   376,    85,    58,   166,
+     311,   377,    60,   109,   110,   609,    86,    87,    88,    62,
+     610,   611,   612,   613,   614,   615,   616,   617,   618,   619,
+      98,   108,    89,    99,   100,    89,   755,    89,   233,   756,
+     108,   233,   826,    32,    33,    34,    35,    89,   827,   233,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     107,   828,   830,   831,   212,   837,   149,   150,   213,   214,
+     215,   216,   217,   218,   459,   109,   110,   313,   404,   420,
+      89,   312,   108,   405,   421,   314,   111,   112,   113,   114,
+     115,   829,   348,   188,   315,   661,   321,   724,   327,   841,
+     109,   110,   116,   933,   328,   117,   934,   935,   936,    89,
+     692,   329,   118,   233,   255,   234,   235,   256,   257,   330,
+     119,   120,   726,   352,   121,   331,    90,   727,   728,   345,
+     109,   110,   672,   673,   674,   675,   676,   677,   740,   905,
+     351,   906,   907,   741,   740,    89,   360,   771,   778,   742,
+     461,    89,   772,   779,    89,   782,   420,   386,   460,   366,
+     783,   784,    89,   883,   880,   563,   564,   565,   884,   168,
+     167,    89,   463,   189,   169,   361,   404,   385,   369,   396,
+     201,   885,   170,   894,   183,   591,   592,   194,   171,   464,
+     219,   422,   423,   376,   203,   372,    89,   259,   895,   374,
+     239,   184,   919,   462,   195,   258,   758,   920,   948,   759,
+     260,   204,   375,   949,   253,   181,   390,   760,   190,   271,
+     761,   261,   829,   387,   294,   202,    89,   652,   659,   903,
+     660,   254,   904,   273,   274,   220,   272,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,     1,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,   931,   700,   701,   932,   886,   887,
+     888,   573,   574,   575,   394,   395,   398,   399,   401,   400,
+     406,   409,   411,    89,   412,   415,   416,   417,   425,   424,
+     426,   427,   428,   429,   431,   432,   433,   439,   440,   434,
+     435,   436,   441,   442,   437,   443,   531,   532,   533,   444,
+     438,   445,   446,   447,   448,   449,   450,   451,   452,   453,
+     454,   456,   542,   457,   470,   471,   472,   473,   474,   477,
+     475,   628,   628,   476,   478,   479,   480,   482,   484,   620,
+     620,   485,   486,   490,   491,   487,   488,   492,   493,   494,
+     495,   496,   498,   461,   691,   499,   294,   500,   501,   502,
+     503,   460,   504,   506,   507,   508,   510,   511,   513,   514,
+     515,   516,   517,   518,   519,   463,   520,   521,   522,   523,
+     524,   525,   526,   528,   556,   560,   557,   529,   530,   534,
+     587,   535,   464,   536,   537,   538,   539,   561,   543,    30,
+     544,   545,   546,   547,   548,   553,   462,   602,   549,   550,
+     551,   552,   558,   559,   562,   567,   568,   569,   570,   636,
+     571,   572,   640,   644,   648,   668,   576,   708,   710,   714,
+     733,   577,   718,   734,   722,   735,   736,   578,   737,   744,
+     745,   747,   748,   751,   750,   754,   764,   579,   580,   581,
+     594,   753,   582,   757,   583,   584,   585,   604,   586,   763,
+     765,   766,   767,   768,   769,   770,   588,   775,   776,   777,
+     589,   590,   790,   791,   793,   794,   797,   796,   601,   785,
+     800,   802,   799,   803,   804,   805,   811,   788,   812,   806,
+     851,   852,   807,   857,   808,   858,   860,   809,   861,   869,
+     868,   881,   810,   844,   917,   882,   845,   896,   898,   921,
+     846,   847,   923,   848,   849,   925,   927,   853,   945,   946,
+     854,   947,   855,   875,   950,   951,   876,   877,   540,   658,
+     455,   608,   458,   430,   813,   603,   628,   878,   839,   879,
+     890,   843,   840,   635,   620,   259,   168,   167,   825,   842,
+     239,   169,   815,   258,   814,   821,   820,   891,   260,   170,
+     822,   183,   922,   512,   253,   171,   275,   271,   823,   261,
+     835,   892,   893,   850,   824,   838,   897,   901,   184,   926,
+     955,   254,   691,   952,   272,   481,   231,   836,   819,   953,
+     817,   816,   181,   189,   505,   818,   201,   509,   483,   219,
+     865,   834,   862,   863,   489,   866,   864,   194,   497,   709,
+     203,   856,   867,   859,   706,   801,   915,   527,   924,   943,
+     954,     0,     0,     0,   195,     0,     0,   204,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   190,     0,
+       0,   202,     0,     0,   220,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   821,     0,     0,     0,     0,
-       0,     0,   817,   816,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   905,     0,   830,     0,     0,     0,
-     818,   831,   904,     0,     0,     0,     0,   819,   820,     0,
-       0,   905,   832,     0,     0,     0,     0,     0,     0,   904
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   825,
+       0,     0,     0,     0,     0,     0,   821,   820,     0,     0,
+       0,   822,     0,     0,     0,     0,     0,     0,   909,   823,
+       0,   835,     0,     0,     0,   824,   908,     0,     0,     0,
+       0,     0,     0,     0,     0,   909,     0,     0,   836,     0,
+       0,     0,     0,   908,     0,     0,     0,     0,     0,     0,
+       0,     0,   834
   };
 
   const short int
   Dhcp6Parser::yycheck_[] =
   {
-      66,    75,    69,    69,    70,    71,    72,    15,    74,    75,
-      76,    77,   543,   546,    75,    75,    69,    70,    71,    72,
-      69,    69,    70,    71,   542,     7,    74,    69,    69,    10,
-       0,    77,    69,    70,    71,   748,     5,    74,     7,     7,
-       9,    39,    40,    41,    42,    43,    44,     7,     3,    31,
-      32,    33,    34,     8,    38,     7,    38,     3,     7,   748,
-       6,   748,   748,   748,   748,    49,    48,     3,    50,     7,
-       6,   152,    56,    57,    56,    57,    58,    59,    60,    61,
-      62,    63,    31,    32,    33,    34,     7,    36,     3,    38,
-      39,    73,    74,     8,    38,    39,    16,    84,    85,    81,
-      17,    18,    19,    20,    16,    25,   152,    56,    57,     7,
-      59,    60,     3,    62,    63,     7,    11,     8,     3,    14,
-      15,    73,     3,     8,    73,     6,     3,    39,    72,    41,
-      42,     8,    81,    45,    46,    47,    31,    32,    33,    34,
-      35,    36,    37,    38,    56,    57,   127,    94,    95,    96,
-     123,   124,   125,   126,   152,   136,   137,   138,     7,     3,
-       7,    56,    57,    39,     8,   152,   879,     7,   152,     7,
-     152,   152,    67,    68,    69,    70,    71,    97,    98,    99,
-     100,    38,   155,   152,   153,   154,   155,     7,    83,     7,
-     879,    86,   879,   879,   879,   879,   130,     3,    93,   133,
-     134,   135,     8,   152,     3,    37,   101,   102,   152,     8,
-     105,     3,    77,    78,    71,    80,     8,   748,    75,    76,
-      77,    78,    79,    80,     6,   756,    87,    88,    89,    90,
-      91,    92,   152,     3,     3,     3,   754,    16,     8,     8,
-     152,   774,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    38,   129,   320,   131,   132,   152,     3,     3,
-      39,    84,    85,     8,     8,    51,    52,    53,    54,    55,
-      56,    57,     3,     8,     3,     3,   152,     8,   352,     8,
-       8,     4,     3,     3,     3,     3,   352,     8,     8,     8,
-       8,     3,    64,    65,    66,   152,     8,   364,   364,   352,
-       3,   367,   310,   311,     3,     8,     3,     3,   374,     8,
-       3,   364,     8,     6,   367,   364,   364,     3,   384,   367,
-       6,   374,   364,   364,     4,   399,   374,   364,   394,     4,
-     367,   384,     8,   399,   486,   487,   488,   374,   399,   399,
-      12,    13,   120,   121,   103,   104,   394,     4,   879,     4,
-       4,     4,   418,     4,     4,     4,     4,   394,     4,     4,
-       4,     3,   152,     4,     4,     8,   152,     3,     3,     8,
-       4,     4,     4,   152,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,     8,     4,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,     4,     4,     4,     4,   153,   425,   426,   427,
-     152,     4,     4,   153,     4,     4,   153,   153,   153,     4,
-       4,     4,     4,   441,     4,     4,     4,     4,     4,   153,
-       4,     4,     4,     4,   155,     4,     4,     4,     4,   153,
-     155,     4,     4,     4,     4,     4,     4,   531,   532,   153,
-       4,   153,   153,     4,     4,   531,   532,     4,     4,     4,
-       4,     4,     4,     4,   153,     4,     4,     4,   155,   553,
-     546,     4,   548,     4,   155,   155,     4,   553,   155,     4,
-       4,   153,     4,   153,   153,     4,     4,   155,     4,   507,
-     553,     4,     4,   155,     8,   122,     7,     7,   155,     7,
-       7,     7,     5,     5,     5,     3,   524,     7,     5,     5,
-       5,     5,     5,     5,   152,   152,     7,     7,     7,     7,
-       5,     5,     5,   152,   152,     5,     7,   152,   152,   152,
-     152,   152,   152,   152,   152,     7,   152,   152,   152,   152,
-     128,     7,     7,     7,     7,     4,     7,     7,    82,     7,
-       4,     4,     4,     4,   152,   152,   152,   152,   152,     4,
-       6,   152,     3,     6,     3,     3,     6,     3,   155,     6,
-       3,     6,     6,     4,     4,     4,     4,     4,     4,     4,
-       4,     4,   152,     3,     6,     6,     3,   152,     6,     3,
-       5,     4,     8,     4,     4,     4,     4,   153,   153,     4,
-       4,   153,   155,     4,   153,   153,     4,     4,     4,     3,
-     320,     6,     4,   153,     4,     8,     7,   153,   153,     8,
-       8,   153,     4,   153,   153,     4,   153,   153,     5,   152,
-     440,   152,   152,     7,     4,   152,     4,   152,     4,     4,
-     525,   541,   530,   152,   736,   350,   346,   152,   152,   532,
-     751,   754,   736,   152,   760,   767,   758,   750,   402,   741,
-     736,   745,   739,   739,   748,   152,   742,   153,   879,   745,
-     152,   748,   748,   152,   745,   745,   739,   155,   153,   739,
-     739,   739,   758,   744,   742,   748,   364,   739,   739,   748,
-     748,   745,   739,    73,   742,   742,   748,   748,   774,   394,
-     399,   748,   747,   790,   787,   785,   791,   788,   374,   785,
-     384,   778,   788,   553,   793,   791,   548,   774,   722,   367,
-     418,   899,   785,   915,   927,   788,   944,   785,   791,    -1,
-     788,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   785,    -1,
-      -1,   788,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      66,    75,    69,    69,    70,    71,    72,    69,    74,    75,
+      76,    77,   550,   546,    75,    69,   547,    69,    70,    71,
+      10,    69,    74,    75,    15,    75,     5,     7,     7,    16,
+       9,     0,     7,    77,    69,    70,    71,     7,    25,    74,
+      75,   752,   123,   124,   125,   126,     7,   752,    69,    70,
+      71,    72,     7,    38,    84,    85,    31,    32,    33,    34,
+     752,   752,   752,    38,   752,     7,    51,    52,    53,    54,
+      55,    56,    57,    48,   155,    50,    17,    18,    19,    20,
+       7,    56,    57,    58,    59,    60,    61,    62,    63,    31,
+      32,    33,    34,    73,    36,     3,    38,    39,    73,    74,
+       8,     7,     3,    16,     3,     7,    81,     8,   152,     8,
+      97,    98,    99,   100,    56,    57,     7,    59,    60,     3,
+      62,    63,   152,   152,     8,     3,    39,     7,    41,    42,
+       8,    73,    45,    46,    47,     7,     3,   127,     7,    81,
+       6,     8,     7,    56,    57,    16,   136,   137,   138,     7,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      11,    38,   152,    14,    15,   152,     3,   152,    39,     6,
+      38,    39,   883,   152,   153,   154,   155,   152,   883,    39,
+      31,    32,    33,    34,    35,    36,    37,    38,    56,    57,
+      37,   883,   883,   883,    71,   883,    12,    13,    75,    76,
+      77,    78,    79,    80,    72,    56,    57,     4,     3,     3,
+     152,     3,    38,     8,     8,     8,    67,    68,    69,    70,
+      71,   752,     3,    49,     3,   758,     4,     8,     4,   760,
+      56,    57,    83,   130,     4,    86,   133,   134,   135,   152,
+     778,     4,    93,    39,    40,    41,    42,    43,    44,     4,
+     101,   102,     3,     3,   105,     4,   322,     8,     8,     4,
+      56,    57,    87,    88,    89,    90,    91,    92,     3,   129,
+       4,   131,   132,     8,     3,   152,     4,     3,     3,     8,
+     354,   152,     8,     8,   152,     3,     3,     3,   354,     3,
+       8,     8,   152,     3,     8,    64,    65,    66,     8,   366,
+     366,   152,   354,   369,   366,     4,     3,     8,     3,     3,
+     376,     8,   366,     8,   366,   120,   121,   369,   366,   354,
+     386,   312,   313,     3,   376,     4,   152,   401,     8,     4,
+     396,   366,     3,   354,   369,   401,     3,     8,     3,     6,
+     401,   376,     4,     8,   396,   366,     4,     3,   369,   401,
+       6,   401,   883,     8,   420,   376,   152,    77,    78,     3,
+      80,   396,     6,    84,    85,   386,   401,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,     3,   103,   104,     6,    94,    95,
+      96,   490,   491,   492,     4,     8,     4,     4,     3,     8,
+       4,     4,     4,   152,     4,     4,     4,     4,     4,   152,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,   153,
+     153,   153,     4,     4,   153,     4,   427,   428,   429,     4,
+     153,     4,     4,     4,     4,     4,     4,     4,   153,     4,
+       4,     4,   443,   155,     4,     4,     4,     4,     4,     4,
+     153,   535,   536,   155,     4,     4,     4,     4,     4,   535,
+     536,   153,     4,     4,     4,   153,   153,     4,     4,     4,
+       4,     4,     4,   557,   550,     4,   552,   153,     4,     4,
+       4,   557,   155,     4,   155,   155,     4,     4,   155,     4,
+       4,   153,     4,   153,   153,   557,     4,     4,   155,   155,
+     155,     4,     4,     4,     8,   152,     3,     7,     7,     7,
+     511,     7,   557,     7,     5,     5,     5,   152,     5,     7,
+       5,     5,     5,     5,     5,     5,   557,   528,     7,     7,
+       7,     7,     5,     5,   152,   152,     5,     7,   152,     7,
+     152,   152,     7,     7,     7,     7,   152,     4,     7,     7,
+       4,   152,     7,     4,    82,     4,     4,   152,     4,     6,
+       3,     6,     3,     3,     6,     3,     3,   152,   152,   152,
+     122,     6,   152,     6,   152,   152,   152,   128,   152,     6,
+       4,     4,     4,     4,     4,     4,   152,     4,     4,     4,
+     152,   152,     6,     3,     6,     3,     3,     6,   152,   152,
+       4,     4,     8,     4,     4,     4,     4,   152,     4,   153,
+       4,     4,   155,     4,   153,     4,     6,   155,     3,     5,
+       4,     8,   153,   153,     4,     8,   153,     8,     7,     4,
+     153,   153,     4,   153,   153,     5,     7,   153,     4,     4,
+     153,     4,   153,   152,     4,   155,   152,   152,   442,   545,
+     348,   534,   352,   322,   740,   529,   740,   152,   755,   152,
+     152,   764,   758,   536,   740,   749,   743,   743,   752,   762,
+     746,   743,   745,   749,   743,   752,   752,   152,   749,   743,
+     752,   743,   153,   404,   746,   743,   762,   749,   752,   749,
+     752,   152,   152,   771,   752,   754,   152,   883,   743,   152,
+     152,   746,   778,   153,   749,   366,    73,   752,   751,   153,
+     748,   746,   743,   789,   396,   749,   792,   401,   369,   795,
+     794,   752,   789,   791,   376,   795,   792,   789,   386,   557,
+     792,   778,   797,   782,   552,   726,   903,   420,   919,   931,
+     948,    -1,    -1,    -1,   789,    -1,    -1,   792,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   789,    -1,
+      -1,   792,    -1,    -1,   795,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   879,    -1,    -1,    -1,    -1,
-      -1,    -1,   879,   879,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   898,    -1,   879,    -1,    -1,    -1,
-     879,   879,   898,    -1,    -1,    -1,    -1,   879,   879,    -1,
-      -1,   915,   879,    -1,    -1,    -1,    -1,    -1,    -1,   915
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   883,
+      -1,    -1,    -1,    -1,    -1,    -1,   883,   883,    -1,    -1,
+      -1,   883,    -1,    -1,    -1,    -1,    -1,    -1,   902,   883,
+      -1,   883,    -1,    -1,    -1,   883,   902,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   919,    -1,    -1,   883,    -1,
+      -1,    -1,    -1,   919,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   883
   };
 
   const unsigned short int
@@ -4063,75 +4067,75 @@ namespace isc { namespace dhcp {
      227,   316,   317,   318,   319,   320,   321,   322,   324,   326,
      328,   329,   331,   362,   364,    40,    43,    44,   186,   227,
      320,   326,   340,   341,   342,   343,   344,   346,   347,   348,
-     349,    84,    85,   186,   259,   260,   261,   263,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   186,   447,   448,   449,   450,   452,   454,   455,
-     457,   458,   459,   462,   464,   465,   466,   467,   470,     6,
-       3,     4,     8,     3,   192,   479,   473,   475,   477,     4,
-       3,     8,   203,   212,   214,     4,     4,     4,     4,     4,
-     276,   307,   333,   363,   365,   299,   238,   250,   244,   413,
-     252,   266,   423,     4,   436,   444,     3,     8,   209,     4,
-       3,     8,   415,   351,   367,   286,   288,   290,     4,     4,
-     294,   292,   384,   409,     3,     8,   361,     3,     8,   377,
-       4,   380,     4,     4,     3,     8,   407,   395,   397,   399,
-     401,   403,   405,     8,     3,     8,   323,   228,     4,   327,
-     325,   330,     4,     8,     3,   345,     4,     4,     8,     3,
-     262,   264,     3,     8,     4,   451,   453,     4,   456,     4,
-       4,   460,   463,     4,     4,     4,   468,   471,     3,     8,
-     171,   171,   152,     4,     4,     4,     4,     4,   190,     4,
-       4,     4,   153,   153,   153,   153,   153,     4,     4,     4,
+     349,   362,   364,    84,    85,   186,   259,   260,   261,   263,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   186,   447,   448,   449,   450,   452,
+     454,   455,   457,   458,   459,   462,   464,   465,   466,   467,
+     470,     6,     3,     4,     8,     3,   192,   479,   473,   475,
+     477,     4,     3,     8,   203,   212,   214,     4,     4,     4,
+       4,     4,   276,   307,   333,   363,   365,   299,   238,   250,
+     244,   413,   252,   266,   423,     4,   436,   444,     3,     8,
+     209,     4,     3,     8,   415,   351,   367,   286,   288,   290,
+       4,     4,   294,   292,   384,   409,     3,     8,   361,     3,
+       8,   377,     4,   380,     4,     4,     3,     8,   407,   395,
+     397,   399,   401,   403,   405,     8,     3,     8,   323,   228,
+       4,   327,   325,   330,     4,     8,     3,   345,     4,     4,
+       8,     3,   262,   264,     3,     8,     4,   451,   453,     4,
+     456,     4,     4,   460,   463,     4,     4,     4,   468,   471,
+       3,     8,   171,   171,   152,     4,     4,     4,     4,     4,
+     190,     4,     4,     4,   153,   153,   153,   153,   153,     4,
        4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-     153,     4,     4,   196,     4,   155,   207,    72,   186,   227,
-     332,   416,   417,   418,   419,   420,     4,     4,     4,     4,
-       4,   153,   155,     4,     4,     4,     4,   284,     4,   359,
-       4,   153,     4,   153,   153,   375,     4,     4,     4,     4,
-       4,     4,     4,   393,     4,     4,   153,     4,     4,     4,
-     155,   318,     4,   155,   155,   342,     4,     4,   260,   155,
-       4,     4,   153,     4,   153,   153,     4,     4,   155,   155,
-     155,     4,     4,   448,     4,     7,     7,   171,   171,   171,
-       7,     7,     7,     5,     5,     5,   173,   175,   171,     5,
-       5,     5,     5,     5,     5,     7,     7,     7,     7,     5,
-     182,   421,     8,     3,     5,     5,   152,   152,   152,    64,
-      65,    66,   295,   152,     5,     7,   152,   152,   152,   182,
-     182,   182,   152,   152,   152,   152,   152,   152,   152,   152,
-     152,   152,   152,   171,   152,   152,   152,   120,   121,   461,
-     122,   123,   124,   125,   126,   155,   469,   152,   171,   195,
-     128,   480,   481,   482,   206,    16,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,   186,   215,   216,   217,
-     220,   222,   224,   226,   227,   229,   230,   231,   232,   233,
-     235,   215,     7,   277,   278,   279,     7,   310,   311,   312,
-       7,   334,   335,   336,     7,   300,   301,   302,    77,   152,
-     239,   240,   241,   242,   180,    78,    80,   241,   245,   246,
-     247,   248,   291,   414,     7,   253,   254,   255,    87,    88,
-      89,    90,    91,    92,   267,   268,   269,   270,   271,   272,
-     273,   274,    16,    97,    98,    99,   100,   186,   229,   424,
-     425,   426,   429,   430,   432,   433,   103,   104,   437,   438,
-     439,   441,   447,   183,     4,   418,     7,   352,   353,   354,
-       7,   368,   369,   370,     7,   385,   386,   387,    82,   410,
-       8,   483,     3,     8,     8,   218,   221,   223,   225,     4,
-       4,     4,     4,     4,   234,   236,     3,     8,     8,   280,
-       6,     3,   313,     6,     3,   337,     6,     3,   303,     6,
-       3,     3,     6,     6,     3,     6,     3,     6,   256,     6,
-       3,     4,     4,     4,     4,     4,     4,     3,     8,   427,
-     431,     4,     4,     4,     3,     8,   440,   442,     3,     8,
-       8,   152,   184,   185,   152,   355,     6,     3,   371,     6,
-       3,   388,     6,     3,   411,     8,     4,   481,     4,     4,
-       4,     4,   153,   155,   153,   155,   153,     4,     4,   216,
-     283,   279,   316,   312,   340,   336,   186,   197,   198,   199,
-     200,   227,   275,   287,   289,   291,   293,   297,   304,   305,
-     332,   362,   364,   408,   302,   240,   246,   291,   259,   255,
-     153,   153,   153,   153,   153,   153,   268,     4,     4,   153,
-     153,   153,   425,     4,     4,   438,     6,     3,   358,   354,
-     374,   370,   391,   387,     4,     5,    17,    18,    19,    20,
-     219,   152,   152,   152,   152,   152,     8,     8,     8,     3,
-       8,     8,    94,    95,    96,   428,   152,   152,   152,   152,
-       8,     8,     8,   152,     7,   484,   485,   305,   486,     3,
-       6,   129,   131,   132,   186,   227,   487,   488,   489,   490,
-     492,   485,   493,     4,   491,     3,     8,     4,   153,     4,
-     488,     5,   152,     7,   494,   495,   496,     3,     6,   130,
-     133,   134,   135,   497,   498,   499,   501,   502,   503,   495,
-     500,     4,     4,     4,     3,     8,     4,   155,   153,   153,
-     498,   152
+       4,     4,   153,     4,     4,   196,     4,   155,   207,    72,
+     186,   227,   332,   362,   364,   416,   417,   418,   419,   420,
+       4,     4,     4,     4,     4,   153,   155,     4,     4,     4,
+       4,   284,     4,   359,     4,   153,     4,   153,   153,   375,
+       4,     4,     4,     4,     4,     4,     4,   393,     4,     4,
+     153,     4,     4,     4,   155,   318,     4,   155,   155,   342,
+       4,     4,   260,   155,     4,     4,   153,     4,   153,   153,
+       4,     4,   155,   155,   155,     4,     4,   448,     4,     7,
+       7,   171,   171,   171,     7,     7,     7,     5,     5,     5,
+     173,   175,   171,     5,     5,     5,     5,     5,     5,     7,
+       7,     7,     7,     5,   182,   421,     8,     3,     5,     5,
+     152,   152,   152,    64,    65,    66,   295,   152,     5,     7,
+     152,   152,   152,   182,   182,   182,   152,   152,   152,   152,
+     152,   152,   152,   152,   152,   152,   152,   171,   152,   152,
+     152,   120,   121,   461,   122,   123,   124,   125,   126,   155,
+     469,   152,   171,   195,   128,   480,   481,   482,   206,    16,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+     186,   215,   216,   217,   220,   222,   224,   226,   227,   229,
+     230,   231,   232,   233,   235,   215,     7,   277,   278,   279,
+       7,   310,   311,   312,     7,   334,   335,   336,     7,   300,
+     301,   302,    77,   152,   239,   240,   241,   242,   180,    78,
+      80,   241,   245,   246,   247,   248,   291,   414,     7,   253,
+     254,   255,    87,    88,    89,    90,    91,    92,   267,   268,
+     269,   270,   271,   272,   273,   274,    16,    97,    98,    99,
+     100,   186,   229,   424,   425,   426,   429,   430,   432,   433,
+     103,   104,   437,   438,   439,   441,   447,   183,     4,   418,
+       7,   352,   353,   354,     7,   368,   369,   370,     7,   385,
+     386,   387,    82,   410,     8,   483,     3,     8,     8,   218,
+     221,   223,   225,     4,     4,     4,     4,     4,   234,   236,
+       3,     8,     8,   280,     6,     3,   313,     6,     3,   337,
+       6,     3,   303,     6,     3,     3,     6,     6,     3,     6,
+       3,     6,   256,     6,     3,     4,     4,     4,     4,     4,
+       4,     3,     8,   427,   431,     4,     4,     4,     3,     8,
+     440,   442,     3,     8,     8,   152,   184,   185,   152,   355,
+       6,     3,   371,     6,     3,   388,     6,     3,   411,     8,
+       4,   481,     4,     4,     4,     4,   153,   155,   153,   155,
+     153,     4,     4,   216,   283,   279,   316,   312,   340,   336,
+     186,   197,   198,   199,   200,   227,   275,   287,   289,   291,
+     293,   297,   304,   305,   332,   362,   364,   408,   302,   240,
+     246,   291,   259,   255,   153,   153,   153,   153,   153,   153,
+     268,     4,     4,   153,   153,   153,   425,     4,     4,   438,
+       6,     3,   358,   354,   374,   370,   391,   387,     4,     5,
+      17,    18,    19,    20,   219,   152,   152,   152,   152,   152,
+       8,     8,     8,     3,     8,     8,    94,    95,    96,   428,
+     152,   152,   152,   152,     8,     8,     8,   152,     7,   484,
+     485,   305,   486,     3,     6,   129,   131,   132,   186,   227,
+     487,   488,   489,   490,   492,   485,   493,     4,   491,     3,
+       8,     4,   153,     4,   488,     5,   152,     7,   494,   495,
+     496,     3,     6,   130,   133,   134,   135,   497,   498,   499,
+     501,   502,   503,   495,   500,     4,     4,     4,     3,     8,
+       4,   155,   153,   153,   498,   152
   };
 
   const unsigned short int
@@ -4171,31 +4175,31 @@ namespace isc { namespace dhcp {
      323,   322,   325,   324,   327,   326,   328,   330,   329,   331,
      333,   332,   334,   334,   335,   335,   337,   336,   339,   338,
      340,   340,   341,   341,   342,   342,   342,   342,   342,   342,
-     342,   343,   345,   344,   346,   347,   348,   349,   351,   350,
-     352,   352,   353,   353,   355,   354,   357,   356,   358,   358,
-     359,   359,   359,   359,   359,   361,   360,   363,   362,   365,
-     364,   367,   366,   368,   368,   369,   369,   371,   370,   373,
-     372,   374,   374,   375,   375,   375,   375,   375,   375,   375,
-     375,   375,   377,   376,   378,   380,   379,   381,   382,   384,
-     383,   385,   385,   386,   386,   388,   387,   390,   389,   391,
-     391,   392,   392,   393,   393,   393,   393,   393,   393,   393,
-     393,   393,   395,   394,   397,   396,   399,   398,   401,   400,
-     403,   402,   405,   404,   407,   406,   409,   408,   411,   410,
-     413,   412,   414,   414,   415,   291,   416,   416,   417,   417,
-     418,   418,   418,   418,   419,   421,   420,   423,   422,   424,
-     424,   425,   425,   425,   425,   425,   425,   425,   427,   426,
-     428,   428,   428,   429,   431,   430,   432,   433,   434,   436,
-     435,   437,   437,   438,   438,   440,   439,   442,   441,   444,
-     443,   446,   445,   447,   447,   448,   448,   448,   448,   448,
+     342,   342,   342,   343,   345,   344,   346,   347,   348,   349,
+     351,   350,   352,   352,   353,   353,   355,   354,   357,   356,
+     358,   358,   359,   359,   359,   359,   359,   361,   360,   363,
+     362,   365,   364,   367,   366,   368,   368,   369,   369,   371,
+     370,   373,   372,   374,   374,   375,   375,   375,   375,   375,
+     375,   375,   375,   375,   377,   376,   378,   380,   379,   381,
+     382,   384,   383,   385,   385,   386,   386,   388,   387,   390,
+     389,   391,   391,   392,   392,   393,   393,   393,   393,   393,
+     393,   393,   393,   393,   395,   394,   397,   396,   399,   398,
+     401,   400,   403,   402,   405,   404,   407,   406,   409,   408,
+     411,   410,   413,   412,   414,   414,   415,   291,   416,   416,
+     417,   417,   418,   418,   418,   418,   418,   418,   419,   421,
+     420,   423,   422,   424,   424,   425,   425,   425,   425,   425,
+     425,   425,   427,   426,   428,   428,   428,   429,   431,   430,
+     432,   433,   434,   436,   435,   437,   437,   438,   438,   440,
+     439,   442,   441,   444,   443,   446,   445,   447,   447,   448,
      448,   448,   448,   448,   448,   448,   448,   448,   448,   448,
-     449,   451,   450,   453,   452,   454,   456,   455,   457,   458,
-     460,   459,   461,   461,   463,   462,   464,   465,   466,   468,
-     467,   469,   469,   469,   469,   469,   471,   470,   473,   472,
-     475,   474,   477,   476,   479,   478,   480,   480,   481,   483,
-     482,   484,   484,   486,   485,   487,   487,   488,   488,   488,
-     488,   488,   489,   491,   490,   493,   492,   494,   494,   496,
-     495,   497,   497,   498,   498,   498,   498,   500,   499,   501,
-     502,   503
+     448,   448,   448,   448,   449,   451,   450,   453,   452,   454,
+     456,   455,   457,   458,   460,   459,   461,   461,   463,   462,
+     464,   465,   466,   468,   467,   469,   469,   469,   469,   469,
+     471,   470,   473,   472,   475,   474,   477,   476,   479,   478,
+     480,   480,   481,   483,   482,   484,   484,   486,   485,   487,
+     487,   488,   488,   488,   488,   488,   489,   491,   490,   493,
+     492,   494,   494,   496,   495,   497,   497,   498,   498,   498,
+     498,   500,   499,   501,   502,   503
   };
 
   const unsigned char
@@ -4235,31 +4239,31 @@ namespace isc { namespace dhcp {
        0,     4,     0,     4,     0,     4,     1,     0,     4,     3,
        0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
        0,     1,     1,     3,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     4,     1,     1,     3,     3,     0,     6,
-       0,     1,     1,     3,     0,     4,     0,     4,     1,     3,
-       1,     1,     1,     1,     1,     0,     4,     0,     4,     0,
-       4,     0,     6,     0,     1,     1,     3,     0,     4,     0,
-       4,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     4,     3,     0,     4,     3,     3,     0,
-       6,     0,     1,     1,     3,     0,     4,     0,     4,     0,
-       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     4,     0,     4,     0,     4,     0,     4,
-       0,     4,     0,     4,     0,     4,     0,     6,     0,     4,
-       0,     6,     1,     3,     0,     4,     0,     1,     1,     3,
-       1,     1,     1,     1,     1,     0,     4,     0,     6,     1,
-       3,     1,     1,     1,     1,     1,     1,     1,     0,     4,
-       1,     1,     1,     3,     0,     4,     3,     3,     3,     0,
-       6,     1,     3,     1,     1,     0,     4,     0,     4,     0,
-       6,     0,     4,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     1,     1,     3,     3,
+       0,     6,     0,     1,     1,     3,     0,     4,     0,     4,
+       1,     3,     1,     1,     1,     1,     1,     0,     4,     0,
+       4,     0,     4,     0,     6,     0,     1,     1,     3,     0,
+       4,     0,     4,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     3,     0,     4,     3,
+       3,     0,     6,     0,     1,     1,     3,     0,     4,     0,
+       4,     0,     1,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     4,     0,     4,     0,     4,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     6,
+       0,     4,     0,     6,     1,     3,     0,     4,     0,     1,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     0,
+       4,     0,     6,     1,     3,     1,     1,     1,     1,     1,
+       1,     1,     0,     4,     1,     1,     1,     3,     0,     4,
+       3,     3,     3,     0,     6,     1,     3,     1,     1,     0,
+       4,     0,     4,     0,     6,     0,     4,     1,     3,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       3,     0,     4,     0,     4,     3,     0,     4,     3,     3,
-       0,     4,     1,     1,     0,     4,     3,     3,     3,     0,
-       4,     1,     1,     1,     1,     1,     0,     4,     0,     4,
-       0,     4,     0,     4,     0,     6,     1,     3,     1,     0,
+       1,     1,     1,     1,     3,     0,     4,     0,     4,     3,
+       0,     4,     3,     3,     0,     4,     1,     1,     0,     4,
+       3,     3,     3,     0,     4,     1,     1,     1,     1,     1,
+       0,     4,     0,     4,     0,     4,     0,     4,     0,     6,
+       1,     3,     1,     0,     6,     1,     3,     0,     4,     1,
+       3,     1,     1,     1,     1,     1,     3,     0,     4,     0,
        6,     1,     3,     0,     4,     1,     3,     1,     1,     1,
-       1,     1,     3,     0,     4,     0,     6,     1,     3,     0,
-       4,     1,     3,     1,     1,     1,     1,     0,     4,     3,
-       3,     3
+       1,     0,     4,     3,     3,     3
   };
 
 
@@ -4436,31 +4440,31 @@ namespace isc { namespace dhcp {
     1119,  1119,  1127,  1127,  1135,  1135,  1143,  1145,  1145,  1153,
     1162,  1162,  1174,  1175,  1180,  1181,  1186,  1186,  1198,  1198,
     1210,  1211,  1216,  1217,  1222,  1223,  1224,  1225,  1226,  1227,
-    1228,  1231,  1233,  1233,  1241,  1243,  1245,  1250,  1258,  1258,
-    1270,  1271,  1274,  1275,  1278,  1278,  1288,  1288,  1297,  1298,
-    1301,  1302,  1303,  1304,  1305,  1308,  1308,  1316,  1316,  1323,
-    1323,  1335,  1335,  1347,  1348,  1351,  1352,  1355,  1355,  1367,
-    1367,  1379,  1380,  1383,  1384,  1385,  1386,  1387,  1388,  1389,
-    1390,  1391,  1394,  1394,  1402,  1407,  1407,  1415,  1420,  1428,
-    1428,  1438,  1439,  1442,  1443,  1446,  1446,  1455,  1455,  1464,
-    1465,  1468,  1469,  1473,  1474,  1475,  1476,  1477,  1478,  1479,
-    1480,  1481,  1484,  1484,  1494,  1494,  1504,  1504,  1512,  1512,
-    1520,  1520,  1528,  1528,  1536,  1536,  1549,  1549,  1559,  1559,
-    1570,  1570,  1580,  1581,  1584,  1584,  1594,  1595,  1598,  1599,
-    1602,  1603,  1604,  1605,  1608,  1610,  1610,  1621,  1621,  1633,
-    1634,  1637,  1638,  1639,  1640,  1641,  1642,  1643,  1646,  1646,
-    1653,  1654,  1655,  1658,  1663,  1663,  1671,  1676,  1683,  1690,
-    1690,  1700,  1701,  1704,  1705,  1708,  1708,  1716,  1716,  1726,
-    1726,  1738,  1738,  1748,  1749,  1752,  1753,  1754,  1755,  1756,
+    1228,  1229,  1230,  1233,  1235,  1235,  1243,  1245,  1247,  1252,
+    1260,  1260,  1272,  1273,  1276,  1277,  1280,  1280,  1290,  1290,
+    1299,  1300,  1303,  1304,  1305,  1306,  1307,  1310,  1310,  1318,
+    1318,  1325,  1325,  1337,  1337,  1349,  1350,  1353,  1354,  1357,
+    1357,  1369,  1369,  1381,  1382,  1385,  1386,  1387,  1388,  1389,
+    1390,  1391,  1392,  1393,  1396,  1396,  1404,  1409,  1409,  1417,
+    1422,  1430,  1430,  1440,  1441,  1444,  1445,  1448,  1448,  1457,
+    1457,  1466,  1467,  1470,  1471,  1475,  1476,  1477,  1478,  1479,
+    1480,  1481,  1482,  1483,  1486,  1486,  1496,  1496,  1506,  1506,
+    1514,  1514,  1522,  1522,  1530,  1530,  1538,  1538,  1551,  1551,
+    1561,  1561,  1572,  1572,  1582,  1583,  1586,  1586,  1596,  1597,
+    1600,  1601,  1604,  1605,  1606,  1607,  1608,  1609,  1612,  1614,
+    1614,  1625,  1625,  1637,  1638,  1641,  1642,  1643,  1644,  1645,
+    1646,  1647,  1650,  1650,  1657,  1658,  1659,  1662,  1667,  1667,
+    1675,  1680,  1687,  1694,  1694,  1704,  1705,  1708,  1709,  1712,
+    1712,  1720,  1720,  1730,  1730,  1742,  1742,  1752,  1753,  1756,
     1757,  1758,  1759,  1760,  1761,  1762,  1763,  1764,  1765,  1766,
-    1769,  1774,  1774,  1782,  1782,  1790,  1795,  1795,  1803,  1808,
-    1813,  1813,  1821,  1822,  1825,  1825,  1833,  1838,  1843,  1848,
-    1848,  1856,  1859,  1862,  1865,  1868,  1874,  1874,  1884,  1884,
-    1891,  1891,  1898,  1898,  1911,  1911,  1924,  1925,  1929,  1933,
-    1933,  1945,  1946,  1950,  1950,  1958,  1959,  1962,  1963,  1964,
-    1965,  1966,  1969,  1974,  1974,  1982,  1982,  1992,  1993,  1996,
-    1996,  2004,  2005,  2008,  2009,  2010,  2011,  2014,  2014,  2022,
-    2027,  2032
+    1767,  1768,  1769,  1770,  1773,  1778,  1778,  1786,  1786,  1794,
+    1799,  1799,  1807,  1812,  1817,  1817,  1825,  1826,  1829,  1829,
+    1837,  1842,  1847,  1852,  1852,  1860,  1863,  1866,  1869,  1872,
+    1878,  1878,  1888,  1888,  1895,  1895,  1902,  1902,  1915,  1915,
+    1928,  1929,  1933,  1937,  1937,  1949,  1950,  1954,  1954,  1962,
+    1963,  1966,  1967,  1968,  1969,  1970,  1973,  1978,  1978,  1986,
+    1986,  1996,  1997,  2000,  2000,  2008,  2009,  2012,  2013,  2014,
+    2015,  2018,  2018,  2026,  2031,  2036
   };
 
   // Print the state stack on the debug stream.
@@ -4495,8 +4499,8 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp6_parser.yy" // lalr1.cc:1167
 } } // isc::dhcp
-#line 4499 "dhcp6_parser.cc" // lalr1.cc:1167
-#line 2037 "dhcp6_parser.yy" // lalr1.cc:1168
+#line 4503 "dhcp6_parser.cc" // lalr1.cc:1167
+#line 2041 "dhcp6_parser.yy" // lalr1.cc:1168
 
 
 void
diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h
index 1f49cef269..e1d8a9ad28 100644
--- a/src/bin/dhcp6/dhcp6_parser.h
+++ b/src/bin/dhcp6/dhcp6_parser.h
@@ -1435,7 +1435,7 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 849,     ///< Last index in yytable_.
+      yylast_ = 862,     ///< Last index in yytable_.
       yynnts_ = 348,  ///< Number of nonterminal symbols.
       yyfinal_ = 28, ///< Termination state number.
       yyterror_ = 1,
diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh
index 6b443a5791..351b4630c8 100644
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,4 @@
-// Generated 201711290710
+// Generated 201711290839
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++
diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh
index 15381427c0..794f8938e4 100644
--- a/src/bin/dhcp6/position.hh
+++ b/src/bin/dhcp6/position.hh
@@ -1,4 +1,4 @@
-// Generated 201711290710
+// Generated 201711290839
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++
diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh
index 41f0b3a870..39a5e1cfdd 100644
--- a/src/bin/dhcp6/stack.hh
+++ b/src/bin/dhcp6/stack.hh
@@ -1,4 +1,4 @@
-// Generated 201711290710
+// Generated 201711290839
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++