Conflicts:
	configure.ac
	src/knot/ctl/remote.c
	src/knot/server/xfr-handler.c
	src/knot/server/zones.c
	src/libknot/nameserver/name-server.c
	src/libknot/nameserver/name-server.h
	src/libknot/packet/packet.c
	src/libknot/packet/packet.h
	src/libknot/packet/query.c
	src/libknot/packet/response.c
	src/libknot/updates/xfr-in.c
	src/utils/common/exec.c
	tests-extra/tests/basic/query/test.py