Conflicts:
	doc/devel/mainpage.dox
	src/bin/dhcp4/dhcp4.dox
	src/bin/dhcp4/dhcp4_srv.cc
	src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
	src/bin/dhcp4/tests/dhcp4_test_utils.h
	src/lib/dhcp_ddns/tests/ncr_unittests.cc
	src/lib/dhcpsrv/lease_mgr.cc
	src/lib/dhcpsrv/lease_mgr.h
	src/lib/dhcpsrv/tests/lease_mgr_unittest.cc