Using whois variant system prop to temporarily deal with rdap property differences
Fixed up some broken test
Use xpath for testing rdap object values
Merge branches 'master' and 'upstream-rdap' of github.com:APNIC-net/whois