Backport #6313

diff --cc pdns/pdns_recursor.cc
Simple merge

diff --cc pdns/rec_channel_rec.cc
Simple merge

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

diff --cc pdns/syncres.hh
Simple merge