contact merge: prefix/suffix do not display and not included in display/sort name construction

two issues pertaining to prefix/suffix in merges:

1) when you attempt to merge two contacts where at least one has a prefix or suffix, the value is not displayed in the merge/diff page. the row will appear, but no value is present.

2) when merging two records where the mainId has a prefix/suffix and the otherId does not, and where you want to retain the mainId value, the actual field value is preserved but is not included when constructing the display/sort name