diff --git a/.mailmap b/.mailmap
index d95ca13c360..4f67da5a224 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,8 +5,10 @@
 # See .organizationmap for organization affiliation
 # See .peoplemap for unique list of people
 #
-Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
+#
 Abhishek Lekshmanan <abhishek.lekshmanan@ril.com> <abhishek.lekshmanan@gmail.com> 
+Ahoussi Armand <ahoussi.say@telecom-bretagne.eu> delco225 <delco225>
+Ailing Zhang <zhangal1992@gmail.com> <ailzhang@users.noreply.github.com>
 Alexandre Marangone <alexandre.marangone@inktank.com> Alexandre Maragone <alexandre.marangone@inktank.com>
 Alexandre Marangone <alexandre.marangone@inktank.com> <a.marangone@gmail.com>
 Alexandre Oliva <oliva@gnu.org> <lxoliva@fsfla.org>
@@ -18,20 +20,19 @@ Alfredo Deza <adeza@redhat.com> <alfredo@deza.pe>
 Andreas Peters <andreas.joachim.peters@cern.ch> <Andreas.Joachim.Peters@cern.ch>
 Andrew Bartlett <abartlet@catalyst.net.nz> Andrew Bartlett <abartlet@samba.org>
 Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
-Ahoussi Armand <ahoussi.say@telecom-bretagne.eu> delco225 <delco225>
+Anis Ayari <ayari_anis@live.fr> Anols
 Aristoteles Neto <aristoteles.neto@webdrive.co.nz>  <wdneto@users.noreply.github.com>
 Ashish Chandra <ashish.a.chandra@ril.com> <mail.ashishchandra@gmail.com>
-Anis Ayari <ayari_anis@live.fr> Anols
 Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu> <baptiste@UbuntuBVM.lan>
-Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
 Billy Olsen <billy.olsen@canonical.com> <billy.olsen@gmail.com>
+Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
 Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
 Caleb Miles <caleb.miles@inktank.com> caleb miles <caselim@gmail.com>
 Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
-Casey Marshall <csm@soe.ucsc.edu> rsdio <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
-Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
+Casey Marshall <csm@soe.ucsc.edu> rsdio <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
 Chendi Xue <chendi.xue@intel.com> Chendi.Xue <chendi.xue@intel.com>
+Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
 Cheng Cheng <ccheng.leo@gmail.com> cchengleo <ccheng.leo@gmail.com>
 Chris Holcombe <chris.holcombe@nebula.com> cholcombe973 <xfactor973@gmail.com>
 Christian Brunner <christian@brunner-muc.de> <chb@muc.de> 
@@ -41,81 +42,80 @@ 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>
 Dan Mick <dan.mick@inktank.com> <dan.mick@dreamhost.com>
-Dan Mick <dmick@redhat.com> <dmick@danceorelse.org>
 Dan Mick <dmick@redhat.com> <dan.mick@redhat.com>
+Dan Mick <dmick@redhat.com> <dmick@danceorelse.org>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
-Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
 Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply.github.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> eestolan <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
-François Lafont <flafdivers@free.fr> François Lafont <francois.lafont@crdp.ac-versailles.fr>
-Florian Coste <fcoste21@gmail.com> nairolf21
+Federico Gimenez <fgimenez@coit.es> fgimenez <federico.gimenez@hola-internet.com>
+Feng Wang <cyclonew@cs.ucsc.edu> cyclonew <cyclonew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Florent Bautista <florent@coppint.com> FlorentCoppint <florent@coppint.com>
 Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
-Federico Gimenez <fgimenez@coit.es> fgimenez <federico.gimenez@hola-internet.com>
+Florian Coste <fcoste21@gmail.com> nairolf21
+François Lafont <flafdivers@free.fr> François Lafont <francois.lafont@crdp.ac-versailles.fr>
 Gary Lowell <gary.lowell@inktank.com> Gary Lowelll <gary.lowell@inktank.com>
 Gary Lowell <gary.lowell@inktank.com> <glowell@flab.ops.newdream.net>
 Gary Lowell <gary.lowell@inktank.com> <glowell@inktank.com>
 Gerben Meijer <gerben@daybyday.nl> <infernix@gmail.com>
 Greg Farnum <gfarnum@redhat.com> <gfarnum@GF-Macbook.local>
+Greg Farnum <gfarnum@redhat.com> <greg@gregs42.com>
 Greg Farnum <greg@inktank.com> Greg Farnu <greg@inktank.com>
 Greg Farnum <greg@inktank.com> <greg.farnum@dreamhost.com>
 Greg Farnum <greg@inktank.com> <gregf@hq.newdream.net>
 Greg Farnum <greg@inktank.com> <gregf@skinny.ops.newdream.net>
-Greg Farnum <gfarnum@redhat.com> <greg@gregs42.com>
 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> <guangyy@gmail.com>
 Guilhem Lettron <guilhem@lettron.fr> <guilhem+github@lettron.fr>
-Feng Wang <cyclonew@cs.ucsc.edu> cyclonew <cyclonew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Hazem Amara <hazem.amara@telecom-bretagne.eu> <hazem@hazem-Inspiron-3537.(none)>
-Huamin Chen <hchen@redhat.com> rootfs <hchen@redhat.com>
 Henry C Chang <henry_c_chang@tcloudcomputing.com> <henry.cy.chang@gmail.com>
 Holger Macht <hmacht@suse.de> <holger@homac.de>
+Huamin Chen <hchen@redhat.com> rootfs <hchen@redhat.com>
 Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>
 Huang Jun <hjwsm1989@gmail.com> huangjun <hjwsm1989@gmail.com>
 Ilya Dryomov <idryomov@redhat.com> <idryomov@gmail.com>
-Jian Wen <wenjian@letv.com> <wenjianhn@gmail.com>
 Jiang Heng <jiangheng0511@gmail.com> jiangheng <jiangheng0511@gmail.com>
 Jiantao He <hejiantao5@gmail.com> hejiantao5 <hejiantao5@gmail.com>
-João Eduardo Luís <joao@redhat.com> <jecluis@gmail.com>
+Jian Wen <wenjian@letv.com> <wenjianhn@gmail.com>
 João Eduardo Luís <joao.luis@inktank.com> Joao Eduardo Luis <joao.luis@inktank.com>
 João Eduardo Luís <joao.luis@inktank.com> <joao@inktank.com>
 João Eduardo Luís <joao.luis@inktank.com> Joao Luis <joao.luis@inktank.com>
+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>
 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>
 John Spray <jspray@redhat.com> <john.spray@redhat.com>
-John Spray <jspray@redhat.com> <jcspray@gmail.com>
+Johnu George <johnugeo@cisco.com> <johnugeorge109@gmail.com>
 John Wilkins <john.wilkins@inktank.com> <john@admin-host.(none)>
 John Wilkins <john.wilkins@inktank.com> <john.wilkins@dreamhost.com>
 John Wilkins <john.wilkins@inktank.com> <johnw@johnw7664.(none)>
-John Wilkins <jwilkins@redhat.com> <jowilk@redhat.com>
-John Wilkins <jwilkins@redhat.com> <jowilki@redhat.com>
 John Wilkins <jwilkins@redhat.com> <jowilkin@redhat.com>
-Johnu George <johnugeo@cisco.com> <johnugeorge109@gmail.com>
+John Wilkins <jwilkins@redhat.com> <jowilki@redhat.com>
+John Wilkins <jwilkins@redhat.com> <jowilk@redhat.com>
+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>
-Josh Durgin <jdurgin@redhat.com> Josh During <jdurgin@redhat.com>
 Kacper Kowalik <xarthisius@gentoo.org> Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org> 
 Kefu Chai <kchai@redhat.com> <tchaikov@gmail.com>
 Kiseleva Alyona <akiselyova@mirantis.com> Ved-vampir
 Laszlo Boszormenyi <gcs@debian.hu> Laszlo Boszormenyi (GCS) <gcs@debian.hu>
 Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com> <lluis@pamies.cat>
+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>
-Loic Dachary <ldachary@redhat.com> <ldachary@dachary.org>
-Loic Dachary <ldachary@redhat.com> <dachary@users.noreply.github.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>
-Ma Jianpeng <jianpeng.ma@intel.com> Jianpeng Ma <jianpeng.ma@intel.com>
 Marco Garcês <marco.garces@bci.co.mz> Marco Garcês <marco@garces.cc>
 Mark Nelson <mnelson@redhat.com> <mark.a.nelson@gmail.com>
 Matthew Roy <matthew@royhousehold.net> <matthew@matthew-ubuntu.(none)>
@@ -130,15 +130,15 @@ Noah Watkins <nwatkins@redhat.com> <jayhawk@cs.ucsc.edu>
 Noah Watkins <nwatkins@redhat.com> <noahwatkins@gmail.com>
 Pascal de Bruijn <pascal@unilogicnetworks.net> Pascal de Bruijn | Unilogic Networks B.V <pascal@unilogicnetworks.net>
 Patience Warnick <patience@cranium.pelton.net> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
-Patrick McGarry <pmcgarry@redhat.com> <pmcgarry@gmail.com>
 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>
-Robert Jansen <r.jansen@fairbanks.nl> <r.jansen86@gmail.com>
+Riccardo Ferretti <rferrett@soe.ucsc.edu> rferrett <rferrett@29311d96-e01e-0410-9327-a35deaab8ce9>
 Roald J. van Loon <roald@roaldvanloon.nl> <roaldvanloon@gmail.com>
+Robert Jansen <r.jansen@fairbanks.nl> <r.jansen86@gmail.com>
 Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
 Ross Turk <ross.turk@inktank.com> <ross@inktank.com> 
 Ross Turk <ross.turk@inktank.com> <ross.turk@dreamhost.com>
-Riccardo Ferretti <rferrett@soe.ucsc.edu> rferrett <rferrett@29311d96-e01e-0410-9327-a35deaab8ce9>
 Sage Weil <sage@inktank.com> <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
 Sage Weil <sage@inktank.com> <sage@ceph0.dreamhost.com>
 Sage Weil <sage@inktank.com> <sage@foil.westwood.newdream.net>
@@ -153,23 +153,23 @@ Sage Weil <sage@inktank.com> <sage.weil@inktank.com>
 Sage Weil <sweil@redhat.com> Sage Weil <sage@redhat.com>
 Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com> <sahid.ferdjaoui@gmail.com>
 Sam Lang <sam.lang@inktank.com> <samlang@gmail.com>
-Samuel Just <sam.just@inktank.com> <sam.just@inktank.com>
-Samuel Just <sjust@redhat.com> <rexludorum@gmail.com>
 Samuel Just <sam.just@inktank.com> <sam.just@dreamhost.com>
+Samuel Just <sam.just@inktank.com> <sam.just@inktank.com>
+Samuel Just <sam.just@inktank.com> <sam.just@inktnak.com>
 Samuel Just <sam.just@inktank.com> Sam Just <sam.just@inktank.com>
 Samuel Just <sam.just@inktank.com> <sam@Pondermatic.(none)>
 Samuel Just <sam.just@inktank.com> <samuelj@hq.newdream.net>
 Samuel Just <sam.just@inktank.com> <samuel.just@dreamhost.com>
 Samuel Just <sam.just@inktank.com> <samuel.just@inktank.com>
-Samuel Just <sam.just@inktank.com> <sam.just@inktnak.com>
-Scott A. Brandt <scott@cs.ucsc.edu> sbrandt <sbrandt@29311d96-e01e-0410-9327-a35deaab8ce9>
+Samuel Just <sjust@redhat.com> <rexludorum@gmail.com>
 Sandon Van Ness <sandon@inktank.com> SandonV <sandon@inktank.com>
 Sandon Van Ness <svanness@redhat.com> <sandon@redhat.com>
+Scott A. Brandt <scott@cs.ucsc.edu> sbrandt <sbrandt@29311d96-e01e-0410-9327-a35deaab8ce9>
 Sebastien Han <sebastien.han@enovance.com> <sebastien.han@enovance.com>
 Sebastien Ponce <sebastien.ponce@cern.ch> Sebastien Ponce <Sebastien.Ponce@cern.ch>
 Shanggao Qiu <qiushanggao@qq.com> qiushanggao
-Shu, Xinxin <xinxin.shu@intel.com> xinxinsh <xinxin.shu@intel.com>
 Shu, Xinxin <xinxin.shu@intel.com> xinxin shu <xinxin.shu@intel.com>
+Shu, Xinxin <xinxin.shu@intel.com> xinxinsh <xinxin.shu@intel.com>
 Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
 Sushma Gurram <sushma.gurram@sandisk.com> sushma <sushma.gurram@sandisk.com>
 Swami Reddy <swami.reddy@ril.com> M Ranga Swami Reddy <swamireddy@gmail.com>
@@ -180,10 +180,10 @@ Tamil Muthamizhan <tamil.muthamizhan@inktank.com> tamil <tamil.muthamizhan@inkta
 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
 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>
-Thomas Cantin <thomas.cantin@telecom-bretagne.eu> ThomasCantin
 Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
 Volker Assmann <volker@twisted-nerve.de> <volker@36-135.mops.RWTH-Aachen.DE>
 Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
@@ -207,12 +207,12 @@ Yehuda Sadeh <yehuda@inktank.com> <yehudasa@gmail.com>
 Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda>
 Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda.infit.com>
 Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@redhat.com>
-Yehuda Sadeh <ysadehwe@redhat.com> <ysadeh@redhat.com>
 Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@rehat.com>
+Yehuda Sadeh <ysadehwe@redhat.com> <ysadeh@redhat.com>
 Yongyue Sun <abioy.sun@gmail.com> Abioy <abioy.sun@gmail.com>
 Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
+Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 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>
-Zhiqiang Wang <zhiqiang.wang@intel.com> Wang, Zhiqiang <zhiqiang.wang@intel.com>
-Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index 25177ef1f62..1ce0b7d7071 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -40,8 +40,8 @@ CERN <contact@cern.ch> Andreas Peters <andreas.joachim.peters@cern.ch>
 CERN <contact@cern.ch> Dan van der Ster <daniel.vanderster@cern.ch>
 CERN <contact@cern.ch> Sebastien Ponce <sebastien.ponce@cern.ch>
 Choopa, LLC <contact@choopa.com> Adam Twardowski <adam.twardowski@gmail.com>
-CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
 CISCO <contact@cisco.com> Johnu George <johnugeo@cisco.com>
+CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
 Cloudwatt <libre.licensing@cloudwatt.com> Christophe Courtaut <christophe.courtaut@gmail.com>
 Cloudwatt <libre.licensing@cloudwatt.com> Florent Flament <florent.flament@cloudwatt.com>
 Cloudwatt <libre.licensing@cloudwatt.com> Loic Dachary <loic@dachary.org>
@@ -88,8 +88,8 @@ GRNet <contact@grnet.gr> Vangelis Koukis <vkoukis@cslab.ece.ntua.gr>
 Hastexo <contact@hastexo.com> Florian Haas <florian@hastexo.com>
 HGST <contact@hgst.com> Kevin Dalley <kevin@kelphead.org>
 HGST <contact@hgst.com> Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com>
-HP <contact@hp.com> Blaine Gardner <blaine.gardner@hp.com>
 Hostplex Hosting <contact@hostplex.net> Andras Elso <elso.andras@gmail.com>
+HP <contact@hp.com> Blaine Gardner <blaine.gardner@hp.com>
 iNic <contact@inic.no> Bjørnar Ness <bjornar.ness@gmail.com>
 Inktank <contact@inktank.com> Alexandre Marangone <alexandre.marangone@inktank.com>
 Inktank <contact@inktank.com> Alex Elder <elder@inktank.com>
@@ -123,28 +123,28 @@ Inktank <contact@inktank.com> Tommi Virtanen <tv@inktank.com>
 Inktank <contact@inktank.com> Tyler Brekke <tyler.brekke@inktank.com>
 Inktank <contact@inktank.com> Warren Usui <warren.usui@inktank.com>
 Inktank <contact@inktank.com> Yehuda Sadeh <yehuda@inktank.com>
+Intel <contact@intel.com> Chendi Xue <chendi.xue@intel.com>
 Intel <contact@intel.com> Ma Jianpeng <jianpeng.ma@intel.com>
 Intel <contact@intel.com> Shu, Xinxin <xinxin.shu@intel.com>
 Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
-Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
 Intel <contact@intel.com> Xiaoxi Chen <xiaoxi.chen@intel.com>
-Intel <contact@intel.com> Zhiqiang Wang <zhiqiang.wang@intel.com>
+Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
 Intel <contact@intel.com> Yuan Zhou <yuan.zhou@intel.com>
-Intel <contact@intel.com> Chendi Xue <chendi.xue@intel.com>
+Intel <contact@intel.com> Zhiqiang Wang <zhiqiang.wang@intel.com>
 Iron Systems Inc. <info@ironsystems.com> Harpreet Dhillon <harpreet@ironsystems.com>
 IT Refined <contact@itrefined.com> Ron Allred <rallred@itrefined.com>
 IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
-Keeper Technology <contact@keepertech.com> Wyllys Ingersoll <wyllys.ingersoll@keepertech.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>
 Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.com>
 Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
+Mellanox <contact@mellanox.com> Vu Pham <vu@mellanox.com>
 Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.com>
 Mirantis <contact@mirantis.com> Dmytro Iurchenko <diurchenko@mirantis.com>
 Mirantis <contact@mirantis.com> Kiseleva Alyona <akiselyova@mirantis.com>
 Mirantis <contact@mirantis.com> Mykola Golub <mgolub@mirantis.com>
 Mirantis <contact@mirantis.com> Radoslaw Zarzynski <rzarzynski@mirantis.com>
 MIT Computer Science and Artificial Intelligence Laboratory <webmaster@csail.mit.edu> Stephen Jahl <stephenjahl@gmail.com>
-Mellanox <contact@mellanox.com> Vu Pham <vu@mellanox.com>
 Nebula <info@nebula.com> Chris Holcombe <chris.holcombe@nebula.com>
 Opower <contact@opower.com> Derrick Schneider <derrick.schneider@opower.com>
 Pacific Northwest National Laboratory <contact@pnl.gov> Brown, David M JR <david.brown@pnl.gov>
@@ -173,8 +173,8 @@ Red Hat <contact@redhat.com> Josh Durgin <jdurgin@redhat.com>
 Red Hat <contact@redhat.com> JuanJose 'JJ' Galvez <jgalvez@redhat.com>
 Red Hat <contact@redhat.com> Kefu Chai <kchai@redhat.com>
 Red Hat <contact@redhat.com> Ken Dreyer <kdreyer@redhat.com>
-Red Hat <contact@redhat.com> Loic Dachary <loic-201408@dachary.org>
 Red Hat <contact@redhat.com> Loic Dachary <ldachary@redhat.com>
+Red Hat <contact@redhat.com> Loic Dachary <loic-201408@dachary.org>
 Red Hat <contact@redhat.com> Luis Pabón <lpabon@redhat.com>
 Red Hat <contact@redhat.com> Mark Nelson <mnelson@redhat.com>
 Red Hat <contact@redhat.com> Neil Levine <nlevine@redhat.com>
@@ -189,8 +189,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> Tamil Muthamizhan <tmuthami@redhat.com>
-Red Hat <contact@redhat.com> Travis Rhoden <trhoden@redhat.com>
 Red Hat <contact@redhat.com> Tom Callaway <spot@redhat.com>
+Red Hat <contact@redhat.com> Travis Rhoden <trhoden@redhat.com>
 Red Hat <contact@redhat.com> Tyler Brekke <tbrekke@redhat.com>
 Red Hat <contact@redhat.com> Venky Shankar <vshankar@redhat.com>
 Red Hat <contact@redhat.com> Warren Usui <wusui@redhat.com>
@@ -204,9 +204,9 @@ Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov
 SanDisk <contact@sandisk.com> Allen Samuels <allen.samuels@sandisk.com>
 SanDisk <contact@sandisk.com> Anand Bhat <anand.bhat@sandisk.com>
 SanDisk <contact@sandisk.com> Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
+SanDisk	<contact@sandisk.com> Shishir Gowda <shishir.gowda@sandisk.com>
 SanDisk <contact@sandisk.com> Somnath Roy <somnath.roy@sandisk.com>
 SanDisk <contact@sandisk.com> Sushma Gurram <sushma.gurram@sandisk.com>
-SanDisk	<contact@sandisk.com> Shishir Gowda <shishir.gowda@sandisk.com>
 Science & Technology Facilities Council <contact@stfc.ac.uk> George Ryall <george.ryall@stfc.ac.uk>
 SendFaster <contact@sendfaster.com> Christopher O'Connell <jwriteclub@gmail.com>
 Spectra Logic <contact@spectralogic.com> Alan Somers <asomers@gmail.com>
@@ -219,35 +219,34 @@ SUSE <contact@suse.com> Owen Synge <osynge@suse.com>
 SUSE <contact@suse.com> Thorsten Behrens <tbehrens@suse.com>
 SWITCH <contact@switch.ch> Jens-Christian Fischer <jens-christian.fischer@switch.ch>
 SWITCH <contact@switch.ch> Simon Leinen <simon.leinen@switch.ch>
-Telecom Bretagne <contact@telecom-bretagne.eu> Ahoussi Armand <ahoussi.say@telecom-bretagne.eu>
-Telecom Bretagne <contact@telecom-bretagne.eu> Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu>
-Telecom Bretagne <contact@telecom-bretagne.eu> Hazem Amara <hazem.amara@telecom-bretagne.eu>
-Telecom Bretagne <contact@telecom-bretagne.eu> Thomas Cantin <thomas.cantin@telecom-bretagne.eu>
 TCloud Computing <contact@tcloudcomputing.com> CC Lien <cc_lien@tcloudcomputing.com>
 TCloud Computing <contact@tcloudcomputing.com> Henry C Chang <henry_c_chang@tcloudcomputing.com>
 TCloud Computing <contact@tcloudcomputing.com> Herb Shiu <herb_shiu@tcloudcomputing.com>
 TCloud Computing <contact@tcloudcomputing.com> Paul Chiang <paul_chiang@tcloudcomputing.com>
+Telecom Bretagne <contact@telecom-bretagne.eu> Ahoussi Armand <ahoussi.say@telecom-bretagne.eu>
+Telecom Bretagne <contact@telecom-bretagne.eu> Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu>
+Telecom Bretagne <contact@telecom-bretagne.eu> Hazem Amara <hazem.amara@telecom-bretagne.eu>
+Telecom Bretagne <contact@telecom-bretagne.eu> Thomas Cantin <thomas.cantin@telecom-bretagne.eu>
 The Linux Box <contact@linuxbox.com> Adam C. Emerson <aemerson@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Ali Maredia <ali@linuxbox.com>
 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> Li Wang <liwang@ubuntukylin.com>
-Ubuntu Kylin <contact@ubuntukylin.com> Yunchuan Wen <yunchuanwen@ubuntukylin.com>
 Ubuntu Kylin <contact@ubuntukylin.com> Min Chen <minchen@ubuntukylin.com>
 Ubuntu Kylin <contact@ubuntukylin.com> MingXin Liu <mingxinliu@ubuntukylin.com>
-Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com>
-Unaffiliated <no@organization.net> Armando Segnini <armaseg@gmail.com>
+Ubuntu Kylin <contact@ubuntukylin.com> Yunchuan Wen <yunchuanwen@ubuntukylin.com>
 Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com>
 Unaffiliated <no@organization.net> Ailing Zhang <zhangal1992@gmail.com> 
-Unaffiliated <no@organization.net> Anis Ayari <ayari_anis@live.fr>
 Unaffiliated <no@organization.net> Andy Allan <github@gravitystorm.co.uk>
+Unaffiliated <no@organization.net> Anis Ayari <ayari_anis@live.fr>
+Unaffiliated <no@organization.net> Armando Segnini <armaseg@gmail.com>
 Unaffiliated <no@organization.net> BJ Lougee <almightybeeij@gmail.com>
 Unaffiliated <no@organization.net> Cheng Cheng <ccheng.leo@gmail.com>
 Unaffiliated <no@organization.net> Christos Stavrakakis <stavr.chris@gmail.com>
-Unaffiliated <no@organization.net> Daniel Schepler <dschepler@gmail.com>
 Unaffiliated <no@organization.net> Colin Mattson <colinmattson@gmail.com>
 Unaffiliated <no@organization.net> Dan Chai <tengweicai@gmail.com>
+Unaffiliated <no@organization.net> Daniel Schepler <dschepler@gmail.com>
 Unaffiliated <no@organization.net> David Anderson <dave@natulte.net>
 Unaffiliated <no@organization.net> Ding Dinghua <dingdinghua85@gmail.com>
 Unaffiliated <no@organization.net> Dominik Hannen <cantares1+github@gmail.com>
@@ -255,16 +254,15 @@ Unaffiliated <no@organization.net> Dongmao Zhang <deanraccoon@gmail.com>
 Unaffiliated <no@organization.net> Erik Logtenberg <erik@logtenberg.eu>
 Unaffiliated <no@organization.net> Federico Gimenez <fgimenez@coit.es>
 Unaffiliated <no@organization.net> Feng He <fenglife@hotmail.com>
-Unaffiliated <no@organization.net> Florian Coste <fcoste21@gmail.com>
 Unaffiliated <no@organization.net> Florent Bautista <florent@coppint.com>
+Unaffiliated <no@organization.net> Florian Coste <fcoste21@gmail.com>
 Unaffiliated <no@organization.net> François Lafont <flafdivers@free.fr>
 Unaffiliated <no@organization.net> Frank Yu <flyxiaoyu@gmail.com>
 Unaffiliated <no@organization.net> Huang Jun <hjwsm1989@gmail.com>
-Unaffiliated <no@organization.net> Jian Wen <wenjian@letv.com>
-Unaffiliated <no@organization.net> Jiang Heng <jiangheng0511@gmail.com>
 Unaffiliated <no@organization.net> Janne Grunau <j@jannau.net>
-Unaffiliated <no@organization.net> Xie Rui <875016668@qq.com>
+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> Karel Striegel <karel.striegel@ipc.be>
 Unaffiliated <no@organization.net> Kefu Chai <tchaikov@gmail.com>
 Unaffiliated <no@organization.net> Kevin Cox <kevincox@kevincox.ca>
@@ -273,9 +271,9 @@ Unaffiliated <no@organization.net> koleosfuscus <koleosfuscus@yahoo.com>
 Unaffiliated <no@organization.net> Laurent Guerby <laurent@guerby.net>
 Unaffiliated <no@organization.net> Matt Richards <mattjrichards@gmail.com>
 Unaffiliated <no@organization.net> Mehdi Abaakouk <sileht@sileht.net>
-Unaffiliated <no@organization.net> Michal Jarzabek <stiopa@gmail.com>
 Unaffiliated <no@organization.net> Michael Nelson <mikenel@tnld.net>
 Unaffiliated <no@organization.net> Michael Riederer <michael@riederer.org>
+Unaffiliated <no@organization.net> Michal Jarzabek <stiopa@gmail.com>
 Unaffiliated <no@organization.net> Ning Yao <zay11022@gmail.com>
 Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9327-a35deaab8ce9>
 Unaffiliated <no@organization.net> Roman Haritonov <reclosedev@gmail.com>
@@ -289,13 +287,15 @@ Unaffiliated <no@organization.net> Volker Voigt <volker.voigt@1und1.de>
 Unaffiliated <no@organization.net> VRan Liu <gliuwr@gmail.com>
 Unaffiliated <no@organization.net> William A. Kennington III <william@wkennington.com>
 Unaffiliated <no@organization.net> xan <xanpeng@gmail.com>
+Unaffiliated <no@organization.net> Xie Rui <875016668@qq.com>
 Unaffiliated <no@organization.net> Xinze Chi <xmdxcxz@gmail.com>
 Unaffiliated <no@organization.net> Yann Dupont <yann@objoo.org>
+Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com>
 Unilogic Networks B.V <contact@unilogicnetworks.net> Pascal de Bruijn <pascal@unilogicnetworks.net> 
+UnitedStack <contact@unitedstack.com> Dong Yuan <yuandong1222@gmail.com>
 UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Haomai Wang <haomaiwang@gmail.com>
 UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
-UnitedStack <contact@unitedstack.com> Dong Yuan <yuandong1222@gmail.com>
 UnitedStack <contact@unitedstack.com> Rongze Zhu <zrzhit@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Adam Crume <adamcrume@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Andrew Leung <aleung@cs.ucsc.edu>
@@ -316,13 +316,13 @@ Whatever <contact@whatever-company.com> Sylvain Munaut <s.munaut@whatever-compan
 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>
-Yahoo! <contact@yahoo-inc.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Lei Dong <leidong@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Ray Lv <xiangyulv@gmail.com>
 Yahoo! <contact@yahoo-inc.com> Wei Luo <luowei@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Xihui He <xihuihe@gmail.com>
+Yahoo! <contact@yahoo-inc.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
 YouScribe <contact@youscribe.fr> Guilhem Lettron <guilhem@lettron.fr>
 #
 # Local Variables:
diff --git a/.peoplemap b/.peoplemap
index e80af2ef9e5..9867dc35c92 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -34,14 +34,11 @@ Noah Watkins <nwatkins@redhat.com> Noah Watkins <noah.watkins@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> Patrick McGarry <patrick@inktank.com>
 Ross Turk <rturk@redhat.com> Ross Turk <ross.turk@inktank.com>
 Sage Weil <sweil@redhat.com> Sage Weil <sage@inktank.com>
+Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
 Samuel Just <sjust@redhat.com> Samuel Just <sam.just@inktank.com>
 Sandon Van Ness <svanness@redhat.com> Sandon Van Ness <sandon@inktank.com>
 Tamil Muthamizhan <tmuthami@redhat.com> Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
 Tyler Brekke <tbrekke@redhat.com> Tyler Brekke <tyler.brekke@inktank.com>
 Warren Usui <wusui@redhat.com> Warren Usui <warren.usui@inktank.com>
-Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>
-John Wilkins <jwilkins@redhat.com> John Wilkins <john.wilkins@inktank.com>
 Yan, Zheng <zyan@redhat.com> Yan, Zheng <zheng.z.yan@intel.com>
-Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
-João Eduardo Luís <joao@redhat.com> João Eduardo Luís <joao.luis@inktank.com>
-Ilya Dryomov <idryomov@redhat.com> Ilya Dryomov <ilya.dryomov@inktank.com>
+Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>