simplify test
Merge remote-tracking branch 'origin/upstream-rdap' into upstream-rdap

Conflicts:
	whois-api/src/test/java/net/ripe/db/whois/api/whois/rdap/WhoisRdapServiceTest.java
	whois-api/src/test/java/net/ripe/db/whois/api/whois/rdap/WhoisRdapServiceTestIntegration.java
Fixed date format for json output
Pulled out duplicated helper methods - consolidated
Merge remote-tracking branch 'origin/upstream-rdap' into upstream-rdap