Minor update with Keycloak 1.0.2
Merge branch 'KC_update' into 1.0.x