Post-merge changes.

src/knot/conf/conf.h

src/libknot/edns.c

src/libknot/nameserver/name-server.c

src/libknot/nsec3.c

src/libknot/packet/packet.c

src/libknot/tsig-op.c

src/libknot/updates/changesets.h

src/libknot/updates/xfr-in.h

src/libknot/util/descriptor.h

src/zcompile/zcompile.c

src/zscanner/test/processing.c