.mailmap: a few more duplicates

I noticed a few more when typing up release notes