KEYCLOAK-800 and tomcat7 test fixes