[master] Merge branch 'master' into trac3336

diff --cc doc/guide/bind10-guide.xml
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
Simple merge

diff --cc src/bin/dhcp4/tests/dhcp4_test_utils.cc
index fc847826943a2182273455645dbfa08ef291acde,57348b703c72aab616e6833b9565164007d177ff..c641f5bb0710e731fc1ae8adf0da709e808cf930
--- 1/src/bin/dhcp4/tests/dhcp4_test_utils.cc
--- 2/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@@ -17,10 -17,9 +17,10 @@@
  #include <asiolink/io_address.h>
  #include <cc/data.h>
  #include <config/ccsession.h>
- #include <dhcp4/config_parser.h>
+ #include <dhcp4/json_config_parser.h>
  #include <dhcp4/tests/dhcp4_test_utils.h>
  #include <dhcp/option4_addrlst.h>
 +#include <dhcp/option_int.h>
  #include <dhcp/option_int_array.h>
  #include <dhcp/option_custom.h>
  #include <dhcp/iface_mgr.h>