Merge branches 'master' and 'upstream-rdap' of github.com:APNIC-net/whois
properties parse better in intellj when defined pom level properties
properties parse better in intellj when defined pom level properties
Merge remote-tracking branch 'origin/master'