[master] Merge branch 'trac3316'

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

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

diff --cc src/bin/dhcp4/tests/dhcp4_test_utils.h
Simple merge