Incorrect MVPA Types for Enrollment Attributes

The Enrollment Attribute type popup uses the default MVPA (Multi-value Prototype Attributes) types for Org Identity attributes, but validation uses the Extended Types for the CO (assuming org identities are not pooled). The select list should correctly reflect the CO types, even for Org Identities (when not pooled).