[master] Finished merge of trac4273 (DHCP4o6 user doc)

diff --cc ChangeLog
index d015a0d85d85968bbd63e8a1439852f63ab33e95,707ce04cbbee64b8d619bd0f3ea4fd9da017e9bc..fa1261e5da7a537dcdba95a3950434a606259249
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,42 -1,5 +1,47 @@@
++1143. [doc]           fdupont
++      User's Guide has been updated with DHCPv4-over-DHCPv6 support
++      details.
++      (Trac #4273, git xxx)
++
 +1142. [doc]           sar
 +      Uncomment the example columns in some rows in the table
 +      listing the classificaiton examples.
 +      (None, git dee442a64f57c8d9dd87636f9e39084ed1b11e03)
 +
 +1141. [func]          marcin
 +      Pkt4, Pkt6 and Pkt4o6 objects passed to hooks libraries
 +      return copies of DHCP options to avoid unintended modification
 +      of the options stored in the server configuration.
 +      (Trac #4497, git e50d2ebe998ec3faad8ade22b6971d6584c81044)
 +
 +1140. [func]          marcin
 +      DHCPv6 server supports assigning multiple reserved addresses
 +      and/or prefixes to a single client.
 +      (Trac #4321, git 0bfb2a9093174e4424051c01beeee7637ac95be0)
 +
 +1139. [doc]           tomek
 +      New features of host reservations have been documented: ability
 +      to reserve standard and vendor options in host reservations. Separate
 +      sections for each backend added.
 +      (Trac #4518, git 99a40fead28f4324dfb55f1962a8bf3e85ab70e2)
 +
 +1138. [build]         fdupont
 +      Compilation problem on FreeBSD caused by unused parameter in
 +      certain version of boost headers is now resolved. Also, INSTALL
 +      file has been updated and now lists dependencies.
 +      (Trac #4283, git 7dbd95651c308527f2e42c533fdc0a12aeec5308)
 +
 +1137. [doc]           fdupont
 +      Developer's Guide has been updated with DHCPv4-over-DHCPv6 support
 +      details.
 +      (Trac #4274, git b3eda594e055f03a9a601bacf0c72c3db0ef8e3c)
 +
 +1136. [doc]           tomek
 +      Included full text of MPL 2.0 and Apache licenses.
 +      (Trac #4529, git baefb4b3e2078a0a0f794b42ef52d6b7d53c9dab)
 +
  1135. [func]          fdupont
 -      Integrated the DHCPv4 service part of DHCPv4-ouver-DHCPv6 support.
 +      Integrated the DHCPv4 service part of DHCPv4-over-DHCPv6 support.
        (Trac #4110, git 7d36aebe14db10b0cbac8e6c0e82160b9d5d7ecd)
  
  1134. [func]          fdupont

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

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