[master] Merge branch 'trac5023' (contexts in v6 pools)

# Conflicts:
#	src/lib/dhcpsrv/pool.h

diff --cc doc/guide/dhcp4-srv.xml
Simple merge

diff --cc doc/guide/dhcp6-srv.xml
Simple merge

diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc
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/lib/dhcpsrv/parsers/dhcp_parsers.cc
Simple merge

diff --cc src/lib/dhcpsrv/pool.h
index acedb01f453feed1963ba8775b7ccf81108c18eb,ac88371adac3c10998981bf6c2d92b9dcaa25c12..cbeb71ae96924d64b36999cae8c9e2f3cc026343
--- 1/src/lib/dhcpsrv/pool.h
--- 2/src/lib/dhcpsrv/pool.h
+++ b/src/lib/dhcpsrv/pool.h
@@@ -8,10 -8,10 +8,12 @@@
  #define POOL_H
  
  #include <asiolink/io_address.h>
 +#include <dhcp/option6_pdexclude.h>
+ #include <boost/shared_ptr.hpp>
+ #include <cc/data.h>
  #include <dhcpsrv/cfg_option.h>
  #include <dhcpsrv/lease.h>
 +#include <boost/shared_ptr.hpp>
  
  #include <vector>