Create .mailmap file

Use .mailmap file to coalesce commits
by the same person using multiple names and/or email addresses

Change-Id: I00c060d62a4671ca6ce0a5e04ac3c4f144ed671e
Merge "Create .mailmap file"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp