Merge remote-tracking branch 'origin/upstream' into upstream-rpslvariant
Changed exception handling for test
Merge branch 'upstream-rdap' of github.com:APNIC-net/whois into upstream-rdap
Patched due to bamboo failing
Merge remote-tracking branch 'origin/upstream-rpslvariant' into upstream-rpslvariant
SCRUM-1684 - RPSL cleanup. (removal of unnecessary attributes, comments, tests, etc)
SCRUM-1684 - rpsl object map changes
SCRUM-1684 - renaming work-in-progress domain auth test so it does not interfere
Cherry pick:

HEAD method is supported
Support application/rdap+json content type.
Conflicts:
	whois-api/src/test/java/net/ripe/db/whois/api/whois/rdap/WhoisRdapServiceTestIntegration.java
Cherry pick some cleanups

Don't fill entities attribute on nested entities.
Removed uncompilable merge artifact
drop type = work from vcard: we don't actually know, so it's more appropriate to leave it out

fix tests for above, and for self link changes
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:
  Removed uncompilable merge artifact
Merge branch 'upstream-rdap' into apnic
Merge branch 'upstream-rpslvariant' into apnic