Conflicts:
	src/bin/dhcp6/config_parser.cc
	src/bin/dhcp6/dhcp6.spec
	src/bin/dhcp6/tests/Makefile.am
	src/bin/dhcp6/tests/config_parser_unittest.cc
	src/lib/dhcpsrv/dhcp_parsers.h
	src/lib/dhcpsrv/tests/Makefile.am
	src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc