Merge "[AAI] Keycloak integration into aai-resources updates"