Merge branch 'upstream-rdap' of https://github.com/APNIC-net/whois into rdap

Conflicts:
	whois-api/src/main/java/net/ripe/db/whois/api/whois/rdap/RdapObjectMapper.java
	whois-api/src/main/java/net/ripe/db/whois/api/whois/rdap/RdapStreamingOutput.java
	whois-api/src/main/java/net/ripe/db/whois/api/whois/rdap/WhoisRdapService.java
	whois-api/src/main/java/net/ripe/db/whois/api/whois/rdap/domain/Domain.java
	whois-api/src/test/java/net/ripe/db/whois/api/whois/rdap/RdapObjectMapperTest.java
	whois-api/src/test/java/net/ripe/db/whois/api/whois/rdap/RdapResponseJsonTest.java
	whois-api/src/test/java/net/ripe/db/whois/api/whois/rdap/WhoisRdapServiceAutnumTestIntegration.java
	whois-api/src/test/java/net/ripe/db/whois/api/whois/rdap/WhoisRdapServiceTestIntegration.java