Merge pull request #822 from mposolda/master

KEYCLOAK-800 and tomcat7 test fixes
KEYCLOAK-788 Ensure expired ClientSessions removed during UserSessionProvider.removeExpiredUserSessions