Fix some issues with NAT testing, improve logging

I tested all the changes with both the proxy and the probetest server. Appears to work alright.

I suggest reviewing commit by commit (and a fast-forward merge)

Maybe related: #40071 (closed)