Merge branch 'master' into v1_6_0

diff --cc configure.ac
index cce694cf89112e39319771bd63778b86d16d20f9,463e52965fcc14f1760d41f96cc54d6d69fa5d00..189e178706e89dd05bb2e865d8e2022040fa409f
mode 100755,100644..100755
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -7,7 -7,7 +7,7 @@@ AC_PREREQ([2.69]
  # For GIT versions, this is x.y.z-git, where x.y.z denotes the software
  # version that was used as a base + changes that were made later, but
  # are not released yet.
- AC_INIT(kea,1.6.0-beta, kea-dev@lists.isc.org)
 -AC_INIT(kea,1.6.0-beta2-git, kea-dev@lists.isc.org)
++AC_INIT(kea,1.6.0-git, kea-dev@lists.isc.org)
  AC_CONFIG_SRCDIR(README)
  
  # serial-tests is not available in automake version before 1.13, so