Fix tests for self urls
Merge branch 'upstream-rdap' of github.com:APNIC-net/whois into upstream-rdap

# By dragank (4) and inazumax (2)
# Via dragank (1) and inazumax (1)
* 'upstream-rdap' of github.com:APNIC-net/whois:
  tiny improvement. removing some useless assignments
  adding a raw attribute value function to rpslobject to support address formatting for multiline (but not multiattribute) address fields in vcards.
  removed constructor, calls super automatically
  jaxrs annoatations are not inherited :(
  reverted port
  jaxrs now accepts custom json media type
Merge branch 'upstream-rdap' of github.com:APNIC-net/whois into upstream-rdap

# By inazumax
# Via inazumax
* 'upstream-rdap' of github.com:APNIC-net/whois:
  starting work on the adding of abuse mailbox entities. removing the code to make addresses "purdy" as per bje's re-request.