Merge "[AAI] Add multi.tenancy.enabled flag to keycloak properties file"