refs #7674 also ensure prefix/suffix present for display_name rebuild when single pair merge
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev