Bug 906756 - Algorithms for merging givenName and familyName changed.
New tests added.
Adapt and merge changed to allow specifying the master contact.
Name composition centralized to avoid code repetition.
Merge pull request #11792 from lodr/bug-906756-changing-algorithms

Bug 906756 - Algorithms for merging givenName and familyName changed.
r=arcturus