Fixup .mailmap file

Fix a few issues with the `.mailmap` file.

(cherry picked from commit 3a5de00c)