Merge branch 'master' into sso

Conflicts:
	whois-api/src/main/java/net/ripe/db/whois/api/rest/InternalUpdatePerformer.java
Fixed tests (TODO: ignored two)