Merge branch 'master' into sso

Conflicts:
	whois-api/src/test/java/net/ripe/db/whois/api/rest/WhoisRestServiceTestIntegration.java
	whois-commons/src/main/java/net/ripe/db/whois/common/rpsl/transform/FilterAuthFunction.java