[master] Finishing merge of trac5121 (HRMode in flex/bison)

diff --cc doc/examples/kea4/reservations.json
index 6fb60898b7c3a1f0ae1bfd8e243eaa7110080583,495691dc9feb98b995eb1f8fdd11a40d24c6efca..2c31cb5ed900650325979c8ab400f3a90c1b3256
--- 1/doc/examples/kea4/reservations.json
--- 2/doc/examples/kea4/reservations.json
+++ b/doc/examples/kea4/reservations.json
@@@ -61,22 -59,29 +61,27 @@@
         "pools": [ { "pool":  "192.0.2.1 - 192.0.2.200" } ],
         "subnet": "192.0.2.0/24",
          "interface": "eth0",
-         "reservation-mode": "out-of-pool",
 -
+         // This directive tells Kea that reservations may be made both in-pool
+         // and out-of-pool. For improved performance, you may move all reservations
+         // out of the dynamic pool and change reservation-mode to "out-of-pool".
+         // Kea will then be able to skip querying for host reservations when
+         // assigning leases from dynamic pool.
+         "reservation-mode": "all",
 -
          "reservations": [
  
 -# This is a reservation for a specific hardware/MAC address. It's a very
 -# simple reservation: just an address and nothing else.
 +// This is a reservation for a specific hardware/MAC address. It's a very
 +// simple reservation: just an address and nothing else.
           {
               "hw-address": "1a:1b:1c:1d:1e:1f",
 -             "ip-address": "192.0.2.202"
 +             "ip-address": "192.0.2.201"
           },
  
 -# This is a reservation for a specific client-id. It also shows
 -# the this client will get a reserved hostname. A hostname can be defined
 -# for any identifier type, not just client-id.
 +// This is a reservation for a specific client-id. It also shows
 +// the this client will get a reserved hostname. A hostname can be defined
 +// for any identifier type, not just client-id.
           {
               "client-id": "01:11:22:33:44:55:66",
 -             "ip-address": "192.0.2.100",
 +             "ip-address": "192.0.2.202",
               "hostname": "special-snowflake"
           },
  

diff --cc doc/examples/kea6/reservations.json
index 83663d6da775356a6987bbb3394d74df12f69d9f,bdab965323a69df0210031c7324c296654e3b933..59e5e97eecfcbf1a18cd255d3819e8199a1c14b2
--- 1/doc/examples/kea6/reservations.json
--- 2/doc/examples/kea6/reservations.json
+++ b/doc/examples/kea6/reservations.json
@@@ -43,7 -41,14 +43,14 @@@
      {
        "subnet": "2001:db8:1::/48",
  
 -      "pools": [ { "pool": "2001:db8:1::/80" } ],
+       // This directive tells Kea that reservations may be made both in-pool
+       // and out-of-pool. For improved performance, you may move all reservations
+       // out of the dynamic pool and change reservation-mode to "out-of-pool".
+       // Kea will then be able to skip querying for host reservations when
+       // assigning leases from dynamic pool.
+       "reservation-mode": "all",
+ 
 +      "pools": [ { "pool": "2001:db8:1::/120" } ],
  
        "pd-pools": [
            {
@@@ -54,16 -59,14 +61,14 @@@
        ],
        "interface": "ethX",
  
-       "reservation-mode": "out-of-pool",
- 
 -# Host reservations. Define several reservations, note that
 -# they are all within the range of the pool of the dynamically
 -# allocated address. The server will exclude the addresses from this
 -# pool and only assign them to the client which has a reservation for
 -# them.
 +// Host reservations. Define several reservations, note that
 +// they are all within the range of the pool of the dynamically
 +// allocated address. The server will exclude the addresses from this
 +// pool and only assign them to the client which has a reservation for
 +// them.
        "reservations": [
 -# This is a simple host reservation. The host with DUID matching
 -# the specified value will get an address of 2001:db8:1::100.
 +// This is a simple host reservation. The host with DUID matching
 +// the specified value will get an address of 2001:db8:1::100.
            {
                "duid": "01:02:03:04:05:0A:0B:0C:0D:0E",
                "ip-addresses": [ "2001:db8:1::100" ]

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

diff --cc src/bin/dhcp4/dhcp4_parser.yy
Simple merge

diff --cc src/bin/dhcp4/parser_context.h
Simple merge

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

diff --cc src/bin/dhcp6/dhcp6_parser.yy
Simple merge

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