Conflicts:
	Knot.files
	src/Makefile.am
	src/common-knot/log.c
	src/common-knot/sockaddr.c
	src/knot/conf/cf-parse.y
	src/knot/ctl/remote.c
	src/knot/nameserver/query_module.c
	src/knot/server/zone-load.c
	src/knot/worker/pool.c
	src/knot/worker/queue.c
	src/knot/zone/zonefile.c
	src/utils/common/exec.c
	src/utils/common/params.c
	src/utils/nsupdate/nsupdate_exec.c