[master] Merge branch 'trac5094'

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

diff --cc src/bin/dhcp6/ctrl_dhcp6_srv.h
Simple merge

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