Merge branch 'master' into merge-zone-zonedata

doc/reference.texi

src/knot/conf/cf-lex.l

src/knot/conf/cf-parse.y

src/knot/conf/conf.c

src/knot/conf/extra.c

src/knot/conf/extra.h

src/knot/conf/includes.c

src/knot/conf/includes.h

src/knot/nameserver/update.c

src/knot/server/zones.c

src/utils/common/exec.c

src/utils/nsupdate/nsupdate_exec.c

src/utils/nsupdate/nsupdate_params.c

src/utils/nsupdate/nsupdate_params.h

src/zscanner/error.c

src/zscanner/error.h

src/zscanner/scanner.c.g2

src/zscanner/scanner.c.t0

src/zscanner/scanner_body.rl

tests-extra/data/.zone