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

diff --cc Makefile.am
index 1268d3d4b72196926ca0435e131c11b553f2827f,2e34d16daf8f278968ab5a2ce8bb501d34662251..bbdaa74ce5928526eafacd81652c9a536261f05d
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -10,7 -10,8 +10,9 @@@ GENHTML=@GENHTML
  DISTCHECK_GTEST_CONFIGURE_FLAG=@DISTCHECK_GTEST_CONFIGURE_FLAG@
  DISTCHECK_CRYPTO_CONFIGURE_FLAG=@DISTCHECK_CRYPTO_CONFIGURE_FLAG@
  DISTCHECK_BOOST_CONFIGURE_FLAG=@DISTCHECK_BOOST_CONFIGURE_FLAG@
 +OVERALL_COVERAGE_DIR=$(abs_top_builddir)/coverage-cpp-html
+ DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG=@DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG@
+ DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=@DISTCHECK_KEA_SHELL_CONFIGURE_FLAG@
  
  DISTCLEANFILES = config.report