Merge remote-tracking branch 'isc-kea/master' into HEAD

diff --cc src/bin/admin/kea-admin.xml
Simple merge

diff --cc src/bin/dhcp4/dhcp4_messages.mes
Simple merge

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

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

diff --cc src/bin/dhcp4/tests/get_config_unittest.cc.skel
Simple merge

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

diff --cc src/bin/dhcp6/tests/get_config_unittest.cc.skel
Simple merge

diff --cc src/lib/dhcp/option_definition.cc
Simple merge

diff --cc src/lib/dhcp/tests/option_definition_unittest.cc
Simple merge

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

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

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

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