Merge branch 'upstream-test-fixes' of github.com:APNIC-net/whois into upstream-rdap