diff --git a/.mailmap b/.mailmap
index 67b61af9141..c18ec5bca6a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,10 +51,10 @@ Clement Lebrun <clement.lebrun.31@gmail.com> <clem_noob@hotmail.fr>
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@alumni.cmu.edu>
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@fatty.ops.newdream.net>
 Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
+Daniel Gryniewicz <dang@redhat.com>  <dang@fprintf.net>
 Dan Mick <dan.mick@inktank.com> <dan.mick@dreamhost.com>
 Dan Mick <dmick@redhat.com> <dan.mick@redhat.com>
 Dan Mick <dmick@redhat.com> <dmick@danceorelse.org>
-Daniel Gryniewicz <dang@redhat.com>  <dang@fprintf.net>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Dennis Schafroth <dennis@schafroth.com> <dennis@schafroth.dk>
@@ -90,12 +90,12 @@ Greg Farnum <greg@inktank.com> <gregory.farnum@dreamhost.com>
 Greg Farnum <greg@inktank.com> Gregory Farnum <greg@inktank.com> 
 Greg Farnum <greg@inktank.com> Reviewed-by: Greg Farnum <greg@inktank.com>
 Guang Yang <yguang@yahoo-inc.com> Guang Yang <yguang@caughtrealize-dl-vm0.peking.corp.yahoo.com>
-Guang Yang <yguang@yahoo-inc.com> <yguang@renownedground.corp.gq1.yahoo.com>
 Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
+Guang Yang <yguang@yahoo-inc.com> <yguang@renownedground.corp.gq1.yahoo.com>
 Guilhem Lettron <guilhem@lettron.fr> <guilhem+github@lettron.fr>
+Haomai Wang <haomai@xsky.com> <haomaiwang@gmail.com>
 Haomai Wang <haomai@xsky.com> <haomai@xsky.io>
 Haomai Wang <haomai@xsky.com> <yuyuyu101@163.com>
-Haomai Wang <haomai@xsky.com> <haomaiwang@gmail.com>
 Hazem Amara <hazem.amara@telecom-bretagne.eu> <hazem@hazem-Inspiron-3537.(none)>
 Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
 Holger Macht <hmacht@suse.de> <holger@homac.de>
@@ -119,8 +119,8 @@ João Eduardo Luís <joao@redhat.com> <jecluis@gmail.com>
 João Eduardo Luís <joao@redhat.com> <jluis@redhat.com>
 João Eduardo Luís <joao@redhat.com> Joao Eduardo Luis <jeclui@gmail.com>
 João Eduardo Luís <joao@redhat.com> Joao Eduardo Luis <joao@redhat.com>
-Joao Eduardo Luis <joao@suse.de> <joao@suse.com>
 Joao Eduardo Luis <joao@suse.de> <jluis@suse.com>
+Joao Eduardo Luis <joao@suse.de> <joao@suse.com>
 Joe Buck <jbbuck@gmail.com> <buck@soe.ucsc.edu>
 John Spray <jspray@redhat.com> <jcspray@gmail.com>
 John Spray <jspray@redhat.com> john <jspray@redhat.com>
@@ -137,8 +137,8 @@ Josh Durgin <jdurgin@redhat.com> Josh During <jdurgin@redhat.com>
 Josh Durgin <josh.durgin@inktank.com> <joshd@hq.newdream.net>
 Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
 Kacper Kowalik <xarthisius@gentoo.org> Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org> 
-Ken Dreyer <kdreyer@redhat.com>  <kdreyer@redhat.com>
 Kefu Chai <kchai@redhat.com> <tchaikov@gmail.com>
+Ken Dreyer <kdreyer@redhat.com>  <kdreyer@redhat.com>
 Kévin Caradant <kevin.caradant@gmail.com> <kevin.caradant@gmail.com>
 Kiseleva Alyona <akiselyova@mirantis.com> Ved-vampir
 Laszlo Boszormenyi <gcs@debian.hu> Laszlo Boszormenyi (GCS) <gcs@debian.hu>
@@ -147,8 +147,8 @@ Loic Dachary <ldachary@redhat.com> <dachary@users.noreply.github.com>
 Loic Dachary <ldachary@redhat.com> <ldachary@dachary.org>
 Loic Dachary <loic@dachary.org> <loic@dachary.com>
 Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
-Lu Shi <shi.lu@h3c.com> <shi.lu@h3c.com>
 Lucas Fantinel <lucas.fantinel@gmail.com> <lucas.fantinel@gmail.com>
+Lu Shi <shi.lu@h3c.com> <shi.lu@h3c.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Jianpeng Ma <jianpeng.ma@intel.com>
 Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
@@ -179,8 +179,8 @@ Patrick McGarry <patrick@inktank.com> scuttlemonkey <patrick@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> <pmcgarry@gmail.com>
 Pavan Rallabhandi <pavan.rallabhandi@sandisk.com> Pavan Rallabhandi <pavanrallabhandis@gmail.com>
 Pete Zaitcev <zaitcev@redhat.com> <zaitcev@kotori.zaitcev.us>
-Qiankun Zheng <zheng.qiankun@h3c.com> <zheng.qiankun@h3c.com>
 Pierre Chaumont <pierre.chaumont31@gmail.com> <pierre.chaumont31@gmail.com>
+Qiankun Zheng <zheng.qiankun@h3c.com> <zheng.qiankun@h3c.com>
 Radoslaw Zarzynski <rzarzynski@mirantis.com> <rzarzynski@github.com>
 Ren Huanwen <ren.huanwen@zte.com.cn> renhwztetecs <rhwlyw@163.com>
 Riccardo Ferretti <rferrett@soe.ucsc.edu> rferrett <rferrett@29311d96-e01e-0410-9327-a35deaab8ce9>
@@ -239,18 +239,18 @@ Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@tamil-VirtualBox.(none)
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@ubuntu.(none)>
 Thomas Bechtold <t.bechtold@telekom.de> <thomasbechtold@jpberlin.de>
 Thomas Cantin <thomas.cantin@telecom-bretagne.eu> ThomasCantin
-Thomas Laumondais <thomas.laumondais@gmail.com> <LSWS0275@EB-OR6251090.toulouse.francetelecom.fr>
 Thomas Johnson <NTmatter@gmail.com> <thomas.johnson@180amsterdam.com>
+Thomas Laumondais <thomas.laumondais@gmail.com> <LSWS0275@EB-OR6251090.toulouse.francetelecom.fr>
 Tianshan Qu <tianshan@xsky.com> <qutianshan@gmail.com>
 Tommi Virtanen <tv@inktank.com> <tommi.virtanen@dreamhost.com>
 Tommi Virtanen <tv@inktank.com> <tv@eagain.net>
 Tommi Virtanen <tv@inktank.com> <tv@hq.newdream.net>
 Travis Rhoden <trhoden@redhat.com> <trhoden@gmail.com>
 Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
+Valentin Arshanes Thomas <valentin.arshanes.thomas@gmail.com> <valentin.arshanes.thomas@gmail.com>
 Varada Kari <varada.kari@sandisk.com> <kariraja@yahoo.com>
 Volker Assmann <volker@twisted-nerve.de> <volker@36-135.mops.RWTH-Aachen.DE>
 Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
-Valentin Arshanes Thomas <valentin.arshanes.thomas@gmail.com> <valentin.arshanes.thomas@gmail.com>
 Walter Huf <hufman@gmail.com> Walter J. Huf <hufman@gmail.com>
 Wang, Yaguang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
 Warren Usui <warren.usui@inktank.com> wusui <warren.usui@inktank.com>
@@ -261,15 +261,15 @@ Wido den Hollander <wido@42on.com> <wido@widodh.nl>
 Wu Xingyi <wuxingyi@letv.com> <wuxingyi@letv.com>
 Xan Peng <xanpeng@gmail.com> xan <xanpeng@gmail.com>
 Xavier Roche <roche+git@exalead.com> <roche@httrack.com>
-Xiaowei Chen <chen.xiaowei@h3c.com> <cxwshawn@gmail.com>
 Xiaowei Chen <chen.xiaowei@h3c.com> <chen.xiaowei@h3c.com>
+Xiaowei Chen <chen.xiaowei@h3c.com> <cxwshawn@gmail.com>
 Xie Rui <875016668@qq.com> Jerry7X <875016668@qq.com>
 Xie Rui <875016668@qq.com> Xie Rui <jerry.xr86@gmail.com>
 Xie Xingguo <xie.xingguo@zte.com.cn> <258156334@qq.com>
 Xie Xingguo <xie.xingguo@zte.com.cn> <xie.xiexingguo@zte.com.cn>
 Xingyi Wu <wuxingyi2015@outlook.com>
-Xinze Chi <xinze@xsky.com> <xmdxcxz@gmail.com>
 Xinze Chi <xinze@xsky.com> <xinze@xksy.com>
+Xinze Chi <xinze@xsky.com> <xmdxcxz@gmail.com>
 Xuan Liu <liu.xuan@h3c.com> <liu.xuan@h3c.com>
 Yannick Atchy Dalama <yannick.atchy.dalama@gmail.com> <yannick.atchy.dalama@gmail.com>
 Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
@@ -293,8 +293,8 @@ Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
 Zengran Zhang <zhangzengran@h3c.com> <zhangzengran@h3c.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> Zhi Z Zhang <zhangz@yahoo-inc.com>
-Zhi Zhang <zhangz.david@outlook.com> <zhangzhi@localhost.localdomain>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Wang, Zhiqiang <zhiqiang.wang@intel.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Zhiqiang Wang <wonzhq@hotmail.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Zhiqiang Wang <zhiqiang.wang@intel.com>
+Zhi Zhang <zhangz.david@outlook.com> <zhangzhi@localhost.localdomain>
diff --git a/.organizationmap b/.organizationmap
index 863986e683a..cd76a8af262 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -193,6 +193,10 @@ IT Refined <contact@itrefined.com> Ron Allred <rallred@itrefined.com>
 IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
 Karlsruhe Institute of Technology <ceph@lists.kit.edu> Daniel J. Hofmann <daniel@trvx.org>
 Keeper Technology <contact@keepertech.com> Wyllys Ingersoll <wyllys.ingersoll@keepertech.com>
+Kylin Cloud <contact@kylin-cloud.com> Jie Wang <jie.wang@kylin-cloud.com>
+Kylin Cloud <contact@kylin-cloud.com> Li Wang <li.wang@kylin-cloud.com>
+Kylin Cloud <contact@kylin-cloud.com> MingXin Liu <mingxin.liu@kylin-cloud.com>
+Kylin Cloud <contact@kylin-cloud.com> Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
 Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.com>
 LETV <contact@letv.com> Wu Xingyi <wuxingyi@letv.com>
 Linaro <contact@linaro.org> Steve Capper <steve.capper@linaro.org>
@@ -225,8 +229,8 @@ Red Hat <contact@redhat.com> Boris Ranto <branto@redhat.com>
 Red Hat <contact@redhat.com> Brad Hubbard <bhubbard@redhat.com>
 Red Hat <contact@redhat.com> Brian Andrus <bandrus@redhat.com>
 Red Hat <contact@redhat.com> Casey Bodley <cbodley@redhat.com>
-Red Hat <contact@redhat.com> Dan Mick <dmick@redhat.com>
 Red Hat <contact@redhat.com> Daniel Gryniewicz <dang@redhat.com>
+Red Hat <contact@redhat.com> Dan Mick <dmick@redhat.com>
 Red Hat <contact@redhat.com> David Zafman <dzafman@redhat.com>
 Red Hat <contact@redhat.com> Douglas Fuller <dfuller@redhat.com>
 Red Hat <contact@redhat.com> Federico Simoncelli <fsimonce@redhat.com>
@@ -266,8 +270,8 @@ Red Hat <contact@redhat.com> Sam Lang <slang@redhat.com>
 Red Hat <contact@redhat.com> Samuel Just <sjust@redhat.com>
 Red Hat <contact@redhat.com> Sandon Van Ness <svanness@redhat.com>
 Red Hat <contact@redhat.com> Sébastien Han <shan@redhat.com>
-Red Hat <contact@redhat.com> Siddharth Sharma <siddharth@redhat.com>
 Red Hat <contact@redhat.com> Shylesh Kumar <shmohan@redhat.com>
+Red Hat <contact@redhat.com> Siddharth Sharma <siddharth@redhat.com>
 Red Hat <contact@redhat.com> Sylvain Baubeau <sbaubeau@redhat.com>
 Red Hat <contact@redhat.com> Tamil Muthamizhan <tmuthami@redhat.com>
 Red Hat <contact@redhat.com> Tom Callaway <spot@redhat.com>
@@ -324,10 +328,6 @@ The Linux Box <contact@linuxbox.com> Casey Bodley <casey@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com>
 The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gmail.com>
 Ubuntu Kylin <contact@ubuntukylin.com> Min Chen <minchen@ubuntukylin.com>
-Kylin Cloud <contact@kylin-cloud.com> Li Wang <li.wang@kylin-cloud.com>
-Kylin Cloud <contact@kylin-cloud.com> MingXin Liu <mingxin.liu@kylin-cloud.com>
-Kylin Cloud <contact@kylin-cloud.com> Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
-Kylin Cloud <contact@kylin-cloud.com> Jie Wang <jie.wang@kylin-cloud.com>
 Unaffiliated <no@organization.net> Abhishek Dixit <dixitabhi@gmail.com>
 Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com>
 Unaffiliated <no@organization.net> Ailing Zhang <zhangal1992@gmail.com> 
@@ -378,8 +378,8 @@ Unaffiliated <no@organization.net> Jeff Weber <jweber@cofront.net>
 Unaffiliated <no@organization.net> Jiang Heng <jiangheng0511@gmail.com>
 Unaffiliated <no@organization.net> Jiantao He <hejiantao5@gmail.com>
 Unaffiliated <no@organization.net> Jian Wen <wenjian@letv.com>
-Unaffiliated <no@organization.net> Jon Bernard <jbernard@tuxion.com>
 Unaffiliated <no@organization.net> Jiaying Ren <mikulely@gmail.com>
+Unaffiliated <no@organization.net> Jon Bernard <jbernard@tuxion.com>
 Unaffiliated <no@organization.net> Jordan Dorne <jordan.dorne@gmail.com>
 Unaffiliated <no@organization.net> Kadu Ribeiro <mail+github@carlosribeiro.me>
 Unaffiliated <no@organization.net> Karel Striegel <karel.striegel@ipc.be>
@@ -465,8 +465,8 @@ Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
 X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
 X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
 XSky <contact@xsky.com> Haomai Wang <haomai@xsky.com>
-XSky <contact@xsky.com> Tianshan Qu <tianshan@xsky.com>
 XSky <contact@xsky.com> Min Chen <chenmin@xsky.com>
+XSky <contact@xsky.com> Tianshan Qu <tianshan@xsky.com>
 XSky <contact@xsky.com> Xinze Chi <xinze@xsky.com>
 Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
diff --git a/.peoplemap b/.peoplemap
index ac7934a91cf..8e43b9a8af1 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -21,8 +21,8 @@ Dan Mick <dmick@redhat.com> Dan Mick <dan.mick@inktank.com>
 David Zafman <dzafman@redhat.com> David Zafman <david.zafman@inktank.com>
 Greg Farnum <gfarnum@redhat.com> Greg Farnum <greg@inktank.com>
 Ilya Dryomov <idryomov@redhat.com> Ilya Dryomov <ilya.dryomov@inktank.com>
-Joao Eduardo Luis <joao@suse.de> João Eduardo Luís <joao@redhat.com>
 Joao Eduardo Luis <joao@suse.de> João Eduardo Luís <joao.luis@inktank.com>
+Joao Eduardo Luis <joao@suse.de> João Eduardo Luís <joao@redhat.com>
 John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>
 John Wilkins <jwilkins@redhat.com> John Wilkins <john.wilkins@inktank.com>
 Josh Durgin <jdurgin@redhat.com> Josh Durgin <josh.durgin@inktank.com>