Conflicts:
	src/bin/dhcp4/config_parser.cc
	src/bin/dhcp6/config_parser.cc
	src/lib/dhcpsrv/dhcpsrv_messages.mes
	src/lib/dhcpsrv/memfile_lease_mgr.cc