Merge branch 'master' into xfr-tsig

diff --cc config.h.in
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc daemon/remote.c
Simple merge

diff --cc daemon/worker.c
Simple merge

diff --cc doc/example.conf.in
Simple merge

diff --cc doc/unbound.conf.rst
Simple merge

diff --cc services/authzone.c
Simple merge

diff --cc smallapp/unbound-checkconf.c
Simple merge

diff --cc util/config_file.c
Simple merge

diff --cc util/config_file.h
Simple merge

diff --cc util/configlexer.lex
Simple merge

diff --cc util/configparser.y
Simple merge

diff --cc util/data/msgparse.c
Simple merge

diff --cc util/fptr_wlist.c
Simple merge

diff --cc util/module.h
Simple merge