Merge branch 'config-h' of https://github.com/andreipavelQ/kea into github38

# Conflicts:
#	src/lib/config/config_data.cc
#	src/lib/config/module_spec.cc
#	src/lib/config/tests/config_data_unittests.cc
#	src/lib/config/tests/module_spec_unittests.cc
#	src/lib/dhcpsrv/cql_connection.cc
#	src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc

diff --cc src/lib/cc/tests/data_unittests.cc
Simple merge

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

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

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

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

diff --cc src/lib/dhcpsrv/cql_connection.cc
index 2598f404d90b617bfa87d15b2da98cab7ba98c40,f1aceda8b45152812b25ecdb1d7b1e90f6fecf87..0e88de782494995f01deabdfebb6e9c41f511f6f
--- 1/src/lib/dhcpsrv/cql_connection.cc
--- 2/src/lib/dhcpsrv/cql_connection.cc
+++ b/src/lib/dhcpsrv/cql_connection.cc
@@@ -18,10 -17,10 +18,12 @@@
  #include <config.h>
  
  #include <dhcpsrv/cql_connection.h>
 -#include <string>
 +#include <dhcpsrv/cql_exchange.h>
 +#include <dhcpsrv/db_exceptions.h>
 +#include <dhcpsrv/dhcpsrv_log.h>
  
 -using namespace std;
++#include <string>
+ 
  namespace isc {
  namespace dhcp {
  

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

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
Simple merge