MDL-42231 For data mapping LDAP or CAS.  Change order of fieldname display checks to check for custom profile fields first to allow custom field shortname to contain number at end.