Add new/updated r7 employees to mailmap
Add and sort other contributors in mailmap
Land #4433 - Update mailmap