Merge "resolv: add missing tlsServers and tlsFingerprints in log"