mailmap: correcting Zhiqiang Wang's mailmap and org affiliation

Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
Merge pull request #2487 from wonzhq/org

mailmap: correcting Zhiqiang Wang's mailmap and org affiliation

Reviewed-by: Loic Dachary <loic-201408@dachary.org>