Add .mailmap for better "git shortlog" reports (rebased onto dev_4_4)



This is the same as gh-308 but rebased onto dev_4_4.

----

None