Merge branch 'master' into features/rfc8914-ede

diff --cc doc/unbound.conf.5.in
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 services/rpz.c
Simple merge

diff --cc services/rpz.h
Simple merge

diff --cc testdata/val_nodata_failwc.rpl
Simple merge

diff --cc util/config_file.h
Simple merge

diff --cc validator/val_utils.c
Simple merge

diff --cc validator/validator.c
Simple merge