Merge branch 'master' into rpz-triggers

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

diff --cc doc/unbound-control.8.in
Simple merge

diff --cc doc/unbound.conf.5.in
Simple merge

diff --cc respip/respip.c
Simple merge

diff --cc services/authzone.c
Simple merge

diff --cc services/localzone.c
Simple merge

diff --cc services/localzone.h
Simple merge

diff --cc services/mesh.c
Simple merge

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