Merge remote-tracking branch 'origin/master' into trustanchor.server

diff --cc pdns/pdns_recursor.cc
Simple merge

diff --cc pdns/recursordist/docs/dnssec.rst
Simple merge

diff --cc pdns/recursordist/docs/settings.rst
Simple merge

diff --cc pdns/syncres.cc
Simple merge