Merge "Make v2 and v3 identity apis configurable"