[keycloak-dev] Changes for Keycloak 2.4.1 should go into master