Conflicts:
	whois-endtoend/src/test/java/net/ripe/db/whois/api/rest/WhoisRestServiceEndToEndTest.java