Proposed some changes I added to the branch.
Perhaps the RELNOTES needs to be updated about
DHCPv4-over-DHCPv6 incompatibility (IMHO the manual
update is enough).