Some mailmap updates (#55048)

Commit

1 year ago

Some mailmap updates (#55048) Updating for consistency with more recent commits by authors.