Profile, Export and Import - Field Selects Should be Grouped and Sorted Logically

Currently, the select fields (drop-down option lists) for Profile (add/edit profile field), Import (map import file) and Export (map fields to export) are ordered somewhat haphazardly, and fields which belong together are not sequential. (Example: "Do Not Trade" is not in sequence with the other Privacy options).

Let's group the fields in the same way as the Edit screens are grouped, and add grouping options (with null values) to separate portions of the list. Example: <option value="">- Demographics - </option>.

I've grouped and sorted the options for Profile fields below. Please follow the same pattern for Import and Export (and get back to me if any issues on these). Note that the option label for on_hold has been modified for clarity (was "On Hold", change to "Email On Hold").

++++++++++++++++++
Profile - Add/Edit Fields
++++++++++++++++++

• • • Profile Select Options for contact type = Individual ***
      "first_name":"First Name",
      "middle_name":"Middle Name",
      "last_name":"Last Name",
      "individual_prefix":"Individual Prefix",
      "individual_suffix":"Individual Suffix",
      "nick_name":"Nick Name",
      "job_title":"Job Title",
      "home_URL":"Website",
      "contact_source":"Source of Contact Data",
      "id":"Internal Contact ID",
      "external_identifier":"External Id",
      "legal_identifier":"Legal Identifier"
      "contact_sub_type":"Contact Sub Type",

• Communication Preferences -
  "do_not_email":"Do Not Email",
  "do_not_phone":"Do Not Phone",
  "do_not_mail":"Do Not Mail",
  "do_not_trade":"Do Not Trade",
  "is_opt_out":"No Bulk Mail (Opted-out)",
  "preferred_communication_method":"Preferred Communication Method",
  "preferred_mail_format":"Preferred Mail Format",
• Locations -
  "location_name":"Location Name",
  "street_address":"Street Address",
  "supplemental_address_1":"Supplemental Address 1",
  "supplemental_address_2":"Supplemental Address 2",
  "city":"City",
  "postal_code_suffix":"Postal Code Suffix",
  "postal_code":"Postal Code",
  "state_province":"State",
  "country":"Country",
  "geo_code_1":"Geo Code 1",
  "geo_code_2":"Geo Code 2",
  "phone":"Phone",
  "email":"Email",
  "on_hold":"Email On Hold",
  "im":"IM Screen Name",
• Demographics -
  "gender":"Gender",
  "birth_date":"Birth Date",
  "is_deceased":"Is Deceased",
  "deceased_date":"Deceased Date",
• Groups and Tags -
  "group":"Group(s)",
  "tag":"Tag(s)"
• Custom Fields - ( or ' - Voter Info - ' ... see NOTE below)
  "custom_1":"Most Important Issue",
  ...
  NOTE: Ideally we can use the title of each custom data group as the option separator, and group the custom fields by civicrm_custom_group and sort by weight. Else, just use '- Custom Fields -' and order by custom_field.id.

• • • Profile Select Options for contact type = Household ***
      "household_name":"Household Name",
      "nick_name":"Nick Name",
      "home_URL":"Website",
      "contact_source":"Source of Contact Data",
      "id":"Internal Contact ID",
      "external_identifier":"External Id",
      "legal_identifier":"Legal Identifier"
      "contact_sub_type":"Contact Sub Type",

• Communication Preferences -
  "do_not_email":"Do Not Email",
  "do_not_phone":"Do Not Phone",
  "do_not_mail":"Do Not Mail",
  "do_not_trade":"Do Not Trade",
  "is_opt_out":"No Bulk Mail (Opted-out)",
  "preferred_communication_method":"Preferred Communication Method",
  "preferred_mail_format":"Preferred Mail Format",
• Locations -
  "location_name":"Location Name",
  "street_address":"Street Address",
  "supplemental_address_1":"Supplemental Address 1",
  "supplemental_address_2":"Supplemental Address 2",
  "city":"City",
  "postal_code_suffix":"Postal Code Suffix",
  "postal_code":"Postal Code",
  "state_province":"State",
  "country":"Country",
  "geo_code_1":"Geo Code 1",
  "geo_code_2":"Geo Code 2",
  "phone":"Phone",
  "email":"Email",
  "on_hold":"Email On Hold",
  "im":"IM Screen Name",
• Groups and Tags -
  "group":"Group(s)",
  "tag":"Tag(s)"
• Custom Fields - ( or ' - Voter Info - ' ... see NOTE above)
  "custom_1":"Most Important Issue",

• • • Profile Select Options for contact type = Organization ***
      "organization_name":"Organization Name",
      "legal_name":"Legal Name",
      "sic_code":"Sic Code",
      "nick_name":"Nick Name",
      "home_URL":"Website",
      "contact_source":"Source of Contact Data",
      "id":"Internal Contact ID",
      "external_identifier":"External Id",
      "legal_identifier":"Legal Identifier"
      "contact_sub_type":"Contact Sub Type",

• Communication Preferences -
  "do_not_email":"Do Not Email",
  "do_not_phone":"Do Not Phone",
  "do_not_mail":"Do Not Mail",
  "do_not_trade":"Do Not Trade",
  "is_opt_out":"No Bulk Mail (Opted-out)",
  "preferred_communication_method":"Preferred Communication Method",
  "preferred_mail_format":"Preferred Mail Format",
• Locations -
  "location_name":"Location Name",
  "street_address":"Street Address",
  "supplemental_address_1":"Supplemental Address 1",
  "supplemental_address_2":"Supplemental Address 2",
  "city":"City",
  "postal_code_suffix":"Postal Code Suffix",
  "postal_code":"Postal Code",
  "state_province":"State",
  "country":"Country",
  "geo_code_1":"Geo Code 1",
  "geo_code_2":"Geo Code 2",
  "phone":"Phone",
  "email":"Email",
  "on_hold":"Email On Hold",
  "im":"IM Screen Name",
• Groups and Tags -
  "group":"Group(s)",
  "tag":"Tag(s)"
• Custom Fields - ( or ' - Voter Info - ' ... see NOTE above)
  "custom_1":"Most Important Issue",