LU-930 misc: update .mailmap again

LU-930 misc: update .mailmap again

Correct some more mailmap entries.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Iadfabbf67f12add4977969f83fc80c93955cac28
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57406
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Peter Jones <pjones@whamcloud.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>