merging the internal REST r&d version API into master

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

Resolved conflicts: mainly due to moving code to base whois service and moving the querybuilder to its own class. All tests are running without errors, need to review integration tests after this merge for potential subtle errors