Merge remote-tracking branch 'isc-kea/master' into cassandra-host-data-source-stress...

diff --cc configure.ac
index b09b2ebffa04a43ca72b7e7369171146487bed3e,9fa181da52862e663f5f50aee273725a1d7cbb62..7b96efae027daf5fae9861a327df6fa87bca96e1
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1303,8 -1187,6 +1300,7 @@@ AC_CONFIG_FILES([Makefil
                   doc/guide/Makefile
                   doc/version.ent
                   ext/Makefile
-                  ext/coroutine/Makefile
 +                 ext/benchmark/Makefile
                   ext/gtest/Makefile
                   m4macros/Makefile
                   src/Makefile

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

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

diff --cc ext/Makefile.am
Simple merge

diff --cc src/lib/dhcpsrv/Makefile.am
Simple merge

diff --cc src/lib/dhcpsrv/tests/Makefile.am
Simple merge