[master] Merge branch 'trac3796' (statistics interface, part 1)

Conflicts:
	src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
	src/bin/dhcp6/tests/dhcp6_test_utils.cc

diff --cc src/bin/d2/d2_process.cc
Simple merge

diff --cc src/bin/d2/d_cfg_mgr.cc
Simple merge

diff --cc src/bin/d2/d_controller.cc
Simple merge

diff --cc src/bin/dhcp4/json_config_parser.cc
Simple merge

diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc
Simple merge

diff --cc src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index fce5de672ec1cebd8777ecf142c0d0692f7218a3,43c6ccfcf6ea2028c0881727b22e1b52df1d2a9f..ecf2c7db7be9082d45485970768e7b2d0ee1b438
--- 1/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
--- 2/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@@ -42,9 -42,7 +42,8 @@@
  #include <gtest/gtest.h>
  #include <hooks/server_hooks.h>
  #include <hooks/hooks_manager.h>
- #include <config/ccsession.h>
 -
++#include <cc/command_interpreter.h>
 +#include <stats/stats_mgr.h>
- 
  #include <boost/scoped_ptr.hpp>
  
  #include <iostream>

diff --cc src/bin/dhcp4/tests/dhcp4_test_utils.cc
Simple merge

diff --cc src/bin/dhcp4/tests/dhcp4_test_utils.h
Simple merge

diff --cc src/bin/dhcp6/json_config_parser.cc
Simple merge

diff --cc src/bin/dhcp6/tests/config_parser_unittest.cc
Simple merge

diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 2e93c1053de190fb0a93f27c31e83816c8affb51,06ddd5ea96886e9485348e563a78a3217809a2ce..8816aa53d089cb3bf71fa0d6a089674b754afe86
--- 1/src/bin/dhcp6/tests/dhcp6_test_utils.cc
--- 2/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@@ -16,8 -16,7 +16,8 @@@
  #include <gtest/gtest.h>
  #include <dhcp6/tests/dhcp6_test_utils.h>
  #include <dhcp6/json_config_parser.h>
- #include <config/ccsession.h>
 +#include <util/pointer_util.h>
+ #include <cc/command_interpreter.h>
  #include <string.h>
  
  using namespace isc::data;