[master] Merge branch 'trac5364'

# Conflicts:
#	src/bin/dhcp6/tests/config_parser_unittest.cc

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

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

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

diff --cc src/bin/dhcp6/tests/config_parser_unittest.cc
index 68a1a6588f700d3ee9c27f5bec4c5206ff74b122,e7c0665f78838cc1987763154fb61695dc36d675..946ba5cb9cd8a9576b68a84542e6d9af81d8bed4
--- 1/src/bin/dhcp6/tests/config_parser_unittest.cc
--- 2/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@@ -5732,7 -5673,7 +5732,7 @@@ TEST_F(Dhcp6ParserTest, sharedNetworksD
      ASSERT_TRUE(s->getInterfaceId());
      EXPECT_TRUE(iface_id2.equals(s->getInterfaceId()));
      EXPECT_EQ(IOAddress("2222::2"), s->getRelayInfo().addr_);
-     EXPECT_FALSE(s->getRapidCommit());
 -    EXPECT_EQ(true, s->getRapidCommit());
++    EXPECT_TRUE(s->getRapidCommit());
      EXPECT_EQ(Network::HR_OUT_OF_POOL, s->getHostReservationMode());
  
      // Ok, now check the second shared subnet.

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