Merge "Update Keycloak settings" into release/proposed/2019.2.0