merge vish/master
merge vish/master

prithivm/branch01,yamt/devstack,bq-xiao/devstack,vsham20/devstack,savi-dev/devstack,innodee/openstackk,nati/devstack_public,ozamiatin/devstack,andrewrothstein/devstack,JioCloud/devstack,dirkmueller/devstack,r-mibu/devstack,bswartz/devstack,openstack-dev/devstack,bigswitch/devstack,richliu/devstack,nawawi/openstack,rushiagr/devstack,sstrato/devstack,group-policy/devstack,virtualopensystems/devstack,jamielennox/devstack,thomasem/devstack,Mahito/devstack,mc2014/devstack,mssumanth/devstack,sequenceiq/devstack,LoHChina/devstack,atulpatil301/devstack,shootstar/devstacktest,costingalan/devstack,dtroyer/devstack,NaokiMiyata/devstack,richliu/devstack,flavio-fernandes/devstack,vishnugonela/devstack,HPCHub/devstack,williamthegrey/devstack,varunarya10/devstack,ewindisch/raspi-devstack,herrsechs/devstack,mmasaki/devstack,Mahito/devstack,ewindisch/raspi-devstack,Juniper/devstack,olivierlemasle/devstack,CloudServer/devstack,nttmcl/devstack_public,wenhuizhang/devstack,avvocatodemarchis/devstack,eharney/devstack,mssumanth/devstack,bq-xiao/devstack,olivierlemasle/devstack,cloudbuilders/devstack,BSJAIN92/OpenStack,mmasaki/devstack,savi-dev/devstack,openstack-dev/devstack,costingalan/devstack,flavio-fernandes/devstack,citrix-openstack-build/devstack,samgoon/devstack,promptworks/devstack,promptworks/devstack,bljgaurav/openstack-test,noironetworks/devstack,nuxeh/devstack,pombredanne/devstack,affo/devstack,parul24/devstack,nuxeh/devstack,pacinete/devstack,bljgaurav/openstack-test,LoHChina/devstack,HPCHub/devstack,j4/devstack,vishnugonela/devstack,nttmcl/devstack_public,bigswitch/devstack,pombredanne/devstack,affo/devstack,j4/devstack,bswartz/devstack,rushiagr/devstack,neerja28/Devstack_GlusterFS,thomasem/devstack,citrix-openstack-build/devstack,eshnil2000/devstack,group-policy/devstack,deepakselvaraj/devstack,ozamiatin/devstack,kplus/devstack-moonshot,TwinkleChawla/devstack,sc68cal/devstack,CiscoSystems/devstack,ykaneko/devstack,neerja28/Devstack_GlusterFS,dtroyer/devstack,parul24/devstack,prithivm/branch01,BSJAIN92/OpenStack,herrsechs/devstack,sequenceiq/devstack,pacinete/devstack,nawawi/openstack,vsham20/devstack,wenhuizhang/devstack,varunarya10/devstack,liuquansheng47/devstack,pczerkas/devstack,tianweizhang/devstack,avvocatodemarchis/devstack,eharney/devstack,inkerra/devstack,pczerkas/devstack,dirkmueller/devstack,nati/devstack_public,TwinkleChawla/devstack,kplus/devstack-moonshot,liuquansheng47/devstack,samgoon/devstack,srics/devstack,tianweizhang/devstack,ykaneko/devstack,cloudbuilders/devstack,mc2014/devstack,NaokiMiyata/devstack,CloudServer/devstack,upadhyay-prashant/devstack,Yuriy-Leonov/devstack,sc68cal/devstack,noironetworks/devstack,andrewrothstein/devstack,r-mibu/devstack,Millnert/contrail-devstack,atulpatil301/devstack,armando-migliaccio/devstack,upadhyay-prashant/devstack