Merge branch 'master' into HEAD

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/dhcp4to6_ipc.cc
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/asiolink/io_address.h
Simple merge

diff --cc src/lib/cc/data.cc
Simple merge

diff --cc src/lib/cryptolink/tests/run_unittests.cc
index 6c92b190ca70a52682f1d0f1ab22954cf96918c4,9f3b06f39c3e92c0d852a3c0bb4592a8f8651fc8..b2e8e4fccc3bd2bea5337cc7c93680a4b7c261e9
--- 1/src/lib/cryptolink/tests/run_unittests.cc
--- 2/src/lib/cryptolink/tests/run_unittests.cc
+++ b/src/lib/cryptolink/tests/run_unittests.cc
@@@ -4,7 -4,7 +4,8 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
+ #include <config.h>
 +#include <gtest/gtest.h>
  
  #include <log/logger_support.h>
  #include <util/unittests/run_all.h>

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

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

diff --cc src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h
Simple merge

diff --cc src/lib/process/testutils/d_test_stubs.h
Simple merge

diff --cc src/lib/util/threads/tests/condvar_unittest.cc
index 40013d93ff28320c59720568b3099d06ae3168bb,292171336504a655b94c7ec97d07706b29e6aae8..80b2472743d9a1ebe65dfc1d7fb41c2440d5ace0
--- 1/src/lib/util/threads/tests/condvar_unittest.cc
--- 2/src/lib/util/threads/tests/condvar_unittest.cc
+++ b/src/lib/util/threads/tests/condvar_unittest.cc
@@@ -134,11 -134,15 +134,13 @@@ signalAndWait(CondVar* condvar, Mutex* 
      condvar->wait(*mutex);
  }
  
 -TEST_F(CondVarTest,
  #ifdef HAS_UNDEFINED_PTHREAD_BEHAVIOR
 -       DISABLED_destroyWhileWait
 +TEST_F(CondVarTest, DISABLED_destroyWhileWait) {
  #else
- TEST_F(CondVarTest, destroyWhileWait) {
+ // This tests had to be disabled because it hangs on most of the OS used in lab
+ // TODO fix destroyWhileWait test
 -       DISABLED_destroyWhileWait
++TEST_F(CondVarTest, DISABLED_destroyWhileWait) {
  #endif
 -) {
      // We'll destroy a CondVar object while the thread is still waiting
      // on it.  This will trigger an assertion failure.
      if (!isc::util::unittests::runningOnValgrind()) {