JAXB marshaller is not thread-safe.
Added TODO to fix wsearch tokenizer (perform exact match).
Update RdapObjectMapperTest to check all relevant field values are being assigned correctly
Zone-c is now a entity contact
Changed exception handling for test
Merge branch 'upstream' into upstream-rpslvariant

* upstream:
  Added TODO to fix wsearch tokenizer (perform exact match).
  JAXB marshaller is not thread-safe.
href attribute of self links must be the canonical url of the resource (the value attribute can be the requested url)
Merge branch 'upstream-rdap' of github.com:APNIC-net/whois into upstream-rdap

# By dragank
# Via dragank
* 'upstream-rdap' of github.com:APNIC-net/whois:
  Changed exception handling for test
  Update RdapObjectMapperTest to check all relevant field values are being assigned correctly Zone-c is now a entity contact
Clean up AttributeType references
Merge branch 'upstream-rdap' into apnic

* upstream-rdap:
  Clean up AttributeType references
  href attribute of self links must be the canonical url of the resource (the value attribute can be the requested url)
  Changed exception handling for test
  Update RdapObjectMapperTest to check all relevant field values are being assigned correctly Zone-c is now a entity contact
Merge branch 'upstream-rpslvariant' into apnic

* upstream-rpslvariant:
  Added TODO to fix wsearch tokenizer (perform exact match).
  JAXB marshaller is not thread-safe.

Conflicts:
	whois-api/src/main/java/net/ripe/db/whois/api/whois/StreamingMarshalXml.java