This PR updates the `.mailmap` file to merge some commit authors using multiple emails. Release Notes: - N/A