GitLab

 - improvements required (__VERSION__ macro omitted)
 - the patch tried to reverse some texts back to 1.1.0 (we're now at 1.3.0)
 - there were many conflicts...

# Conflicts:
#	doc/guide/admin.xml
#	doc/guide/ctrl-channel.xml
#	doc/guide/ddns.xml
#	doc/guide/dhcp4-srv.xml
#	doc/guide/dhcp6-srv.xml
#	doc/guide/install.xml
#	doc/guide/intro.xml
#	doc/guide/kea-guide.xml
#	src/bin/admin/kea-admin.xml
#	src/bin/agent/kea-ctrl-agent.xml
#	src/bin/d2/kea-dhcp-ddns.xml
#	src/bin/dhcp4/kea-dhcp4.xml
#	src/bin/dhcp6/kea-dhcp6.xml
#	src/bin/keactrl/keactrl.xml
#	src/bin/lfc/kea-lfc.xml
#	src/bin/perfdhcp/perfdhcp.xml
#	src/bin/shell/kea-shell.xml
#	src/bin/sockcreator/kea-sockcreator.xml

 - the opion-space check removed from DHCPv4 similar to DHCPv6

# Conflicts:
#	Makefile.am

# Conflicts:
#	src/bin/admin/admin-utils.sh
#	src/lib/cc/data.h
#	src/lib/config/module_spec.cc
#	src/lib/config/module_spec.h
#	src/lib/cryptolink/tests/run_unittests.cc
#	src/lib/util/threads/tests/condvar_unittest.cc

 - added unit-test for complex S46 options
 - fixed support for option spaces other than dhcp6
 - added printing of psid

 - it is now possible to define multiple classes for a pool
 - small doc corrections

This reverts commit 401a5a52.

# Conflicts:
#	doc/guide/dhcp6-srv.xml
#	src/lib/dhcp/dhcp6.h
#	src/lib/dhcp/std_option_defs.h
#	src/lib/dhcp/tests/libdhcp++_unittest.cc

# Conflicts:
#	src/lib/config/config_data.cc
#	src/lib/config/module_spec.cc
#	src/lib/config/tests/config_data_unittests.cc
#	src/lib/config/tests/module_spec_unittests.cc
#	src/lib/dhcpsrv/cql_connection.cc
#	src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc