Changed the way request urls are generated
SCRUM-1684 - apnic-integration should not be running ripe tests
SCRUM-1684 - minor text fixes
SCRUM-1684 - minor text fixes manually brought in from upstream
Merge branch 'upstream-rpslvariant' into apnic

Conflicts:
	whois-oneshot/pom.xml
Merge branch 'upstream-rdap' into apnic