De-dupe and update .mailmap
Land #2818, .mailmap de-dupe and update