[master] Merge branch 'trac4236'

diff --cc src/bin/d2/tests/d2_process_tests.sh.in
Simple merge

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

diff --cc src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
Simple merge

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

diff --cc src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
Simple merge

diff --cc src/bin/keactrl/tests/keactrl_tests.sh.in
Simple merge

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

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

diff --cc src/lib/dhcp/tests/pkt6_unittest.cc
Simple merge

diff --cc src/lib/eval/eval.dox
Simple merge

diff --cc src/lib/testutils/dhcp_test_lib.sh.in
Simple merge