* stable-2.14: Update the .mailmap file Update .mailmap Preserve line-endings in inline editing Change-Id: I57d8536416ace5c08a012b3093424b26abdc39ed