Merge branch 'master' into rdap

Conflicts:
	whois-api/pom.xml
	whois-api/src/main/java/net/ripe/db/whois/api/rest/StreamingMarshalXml.java
	whois-internal/src/test/java/net/ripe/db/whois/internal/api/acl/AclProxyServiceTest.java