Merge branch 'master' into restapi

Conflicts:
	whois-api/src/main/java/net/ripe/db/whois/api/whois/WhoisRestService.java
	whois-api/src/test/java/net/ripe/db/whois/api/whois/WhoisRestServiceTestIntegration.java