CRM-1963 Export Primary Fields - Organization Name Column is Mis-labeled as Current Employer and Current Employer Data is Not Exported

Search for contacts where type = Organization.
Select all and select Export
Select "Primary Contact Fields"

The column that contains the Organization Name has "Current Employer" as the column header. This header should be "Organization Name"

ALSO, if you export an Individual after filling in the "Current Employer" field (i.e. creating the Employee/Employer relationship)... the column labeled "Current Employer" does NOT have data in it. If possible, we should retain this column in the "Primary Contact fields" export set and populate it properly for Individuals who have Employe/Employer relationship). Else, we should get rid of it and only have a column for Organization Name which is used for Organization-type contacts.