[4204fd] Merge original trac4204

diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc
Simple merge

diff --cc src/bin/dhcp6/tests/config_parser_unittest.cc
Simple merge

diff --cc src/lib/dhcp/option_space_container.h
Simple merge

diff --cc src/lib/dhcpsrv/cfg_option.h
Simple merge

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

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

diff --cc src/lib/eval/token.h
Simple merge