Merge branch 'master' into rpz

diff --cc daemon/remote.c
Simple merge

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

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

diff --cc services/localzone.c
Simple merge

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