Merge "Add keycloak related files"