[2270] Merge branch 'master' into trac2270
Conflicts: ChangeLog doc/devel/02-dhcp.dox src/bin/dhcp4/ctrl_dhcp4_srv.cc src/bin/dhcp4/dhcp4_srv.cc src/bin/dhcp4/dhcp4_srv.h src/bin/dhcp6/config_parser.cc src/bin/dhcp6/config_parser.h
Conflicts: ChangeLog doc/devel/02-dhcp.dox src/bin/dhcp4/ctrl_dhcp4_srv.cc src/bin/dhcp4/dhcp4_srv.cc src/bin/dhcp4/dhcp4_srv.h src/bin/dhcp6/config_parser.cc src/bin/dhcp6/config_parser.h