[master] Finished merge of trac5105 (commas in option string data)

diff --cc doc/examples/kea6/multiple-options.json
index 45b249dd7e715f444680597bf46aa4fea9ebd60c,3e30487517b7b8560da19d3ec52648fa7e8e1361..3ee58ef0de9decda5b7dfdfd65d99dc4120fba08
--- 1/doc/examples/kea6/multiple-options.json
--- 2/doc/examples/kea6/multiple-options.json
+++ b/doc/examples/kea6/multiple-options.json
@@@ -28,19 -28,17 +28,19 @@@
    "renew-timer": 1000,
    "rebind-timer": 2000,
  
- # Defining a subnet. There are 2 DHCP options returned to the
 -// Defining a subnet. There are 3 DHCP options returned to the
 -// clients connected to this subnet. The first option is identified
 -// by the name. The second option is identified by the code.
 -// There are two address pools defined within this subnet. Pool
 -// specific value for option 12 is defined for the pool:
 -// 2001:db8:1::1 - 2001:db8:1::100. Clients obtaining an address
 -// from this pool will be assigned option 12 with a value of
 -// 3001:cafe::21. Clients belonging to this subnet but obtaining
 -// addresses from the other pool, or the clients obtaining
 -// stateless configuration will be assigned subnet specific value
 -// of option 12, i.e. 2001:db8:1:0:ff00::1.
++# Defining a subnet. There are 3 DHCP options returned to the
 +# clients connected to this subnet. The first option is identified
 +# by the name. The second option is identified by the code.
 +# There are two address pools defined within this subnet. Pool
 +# specific value for option 12 is defined for the pool:
 +# 2001:db8:1::1 - 2001:db8:1::100. Clients obtaining an address
 +# from this pool will be assigned option 12 with a value of
 +# 3001:cafe::21. Clients belonging to this subnet but obtaining
 +# addresses from the other pool, or the clients obtaining
 +# stateless configuration will be assigned subnet specific value
 +# of option 12, i.e. 2001:db8:1:0:ff00::1.
 +# For DHCPv6 subnets can have prefix delegation pools too so
 +# a pd-pools with an option-data is defined too.
    "subnet6": [
      {
        "option-data": [
@@@ -64,22 -80,9 +82,22 @@@
              ]
          },
          {
-             "pool": "2001:db8:1::500 - 2001:db8:2::1000"
+             "pool": "2001:db8:1::500 - 2001:db8:1::1000"
          }
        ],
 +      "pd-pools": [
 +        {
 +             "prefix": "2001:2b8:2::",
 +             "prefix-len": 56,
 +             "delegated-len": 64,
 +             "option-data": [
 +               {
 +                   "code": 12,
 +                   "data": "3001:cafe::12:"
 +               }
 +             ]
 +         }
 +      ],
        "subnet": "2001:db8:1::/64",
        "interface": "ethX"
      }

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

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

diff --cc src/lib/dhcpsrv/parsers/dhcp_parsers.cc
Simple merge

diff --cc src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
Simple merge

diff --cc src/lib/util/tests/strutil_unittest.cc
Simple merge