Fix a few issues with the `.mailmap` file. (cherry picked from commit 3a5de00c)
3a5de00c
(cherry picked from commit a5e1932c)
a5e1932c