Merge "Fix identity new endpoint_type options for old users"