Merge branch 'trac2749'

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

diff --cc src/lib/dhcp/libdhcp++.cc
Simple merge

diff --cc src/lib/dhcp/option6_iaaddr.cc
Simple merge

diff --cc src/lib/dhcp/option6_iaprefix.cc
Simple merge