trunk merged. conflict resolved.
trunk merged. conflict resolved.
saleemjaveds/https-github.com-openstack-nova,phenoxim/nova,NeCTAR-RC/nova,tanglei528/nova,dawnpower/nova,hanlind/nova,NoBodyCam/TftpPxeBootBareMetal,affo/nova,Juniper/nova,raildo/nova,cyx1231st/nova,leilihh/nova,JianyuWang/nova,Juniper/nova,rickerc/nova_audit,alaski/nova,maoy/zknova,termie/nova-migration-demo,salv-orlando/MyRepo,silenceli/nova,iuliat/nova,houshengbo/nova_vmware_compute_driver,zhimin711/nova,termie/pupa,j-carpentier/nova,whitepages/nova,JioCloud/nova_test_latest,ruslanloman/nova,joker946/nova,aristanetworks/arista-ovs-nova,TieWei/nova,sebrandon1/nova,viggates/nova,luogangyi/bcec-nova,tanglei528/nova,BeyondTheClouds/nova,MountainWei/nova,Juniper/nova,kimjaejoong/nova,klmitch/nova,gooddata/openstack-nova,Yusuke1987/openstack_template,sridevikoushik31/openstack,gooddata/openstack-nova,Brocade-OpenSource/OpenStack-DNRM-Nova,LoHChina/nova,openstack/nova,leilihh/novaha,projectcalico/calico-nova,fnordahl/nova,takeshineshiro/nova,superstack/nova,rajalokan/nova,CEG-FYP-OpenStack/scheduler,klmitch/nova,houshengbo/nova_vmware_compute_driver,cloudbase/nova-virtualbox,alvarolopez/nova,eneabio/nova,tealover/nova,eonpatapon/nova,paulmathews/nova,Triv90/Nova,angdraug/nova,rahulunair/nova,noironetworks/nova,berrange/nova,Brocade-OpenSource/OpenStack-DNRM-Nova,mgagne/nova,plumgrid/plumgrid-nova,scripnichenko/nova,petrutlucian94/nova,dstroppa/openstack-smartos-nova-grizzly,JioCloud/nova,jianghuaw/nova,aristanetworks/arista-ovs-nova,sridevikoushik31/openstack,thomasem/nova,tianweizhang/nova,LoHChina/nova,adelina-t/nova,SUSE-Cloud/nova,virtualopensystems/nova,scripnichenko/nova,sacharya/nova,jianghuaw/nova,JioCloud/nova_test_latest,rahulunair/nova,shootstar/novatest,imsplitbit/nova,JianyuWang/nova,savi-dev/nova,superstack/nova,usc-isi/nova,ntt-sic/nova,cloudbau/nova,alvarolopez/nova,tangfeixiong/nova,yatinkumbhare/openstack-nova,bclau/nova,openstack/nova,belmiromoreira/nova,cernops/nova,josephsuh/extra-specs,cyx1231st/nova,Yuriy-Leonov/nova,sridevikoushik31/nova,watonyweng/nova,NoBodyCam/TftpPxeBootBareMetal,joker946/nova,eneabio/nova,tudorvio/nova,cernops/nova,NeCTAR-RC/nova,rickerc/nova_audit,salv-orlando/MyRepo,orbitfp7/nova,Tehsmash/nova,zaina/nova,salv-orlando/MyRepo,phenoxim/nova,mahak/nova,vladikr/nova_drafts,jeffrey4l/nova,angdraug/nova,TieWei/nova,zzicewind/nova,sridevikoushik31/nova,ted-gould/nova,CiscoSystems/nova,Metaswitch/calico-nova,barnsnake351/nova,devoid/nova,BeyondTheClouds/nova,vmturbo/nova,mikalstill/nova,noironetworks/nova,klmitch/nova,iuliat/nova,shail2810/nova,bigswitch/nova,projectcalico/calico-nova,Juniper/nova,badock/nova,isyippee/nova,maheshp/novatest,termie/pupa,sridevikoushik31/nova,double12gzh/nova,imsplitbit/nova,spring-week-topos/nova-week,sebrandon1/nova,akash1808/nova_test_latest,mahak/nova,mandeepdhami/nova,sebrandon1/nova,fajoy/nova,psiwczak/openstack,MountainWei/nova,russellb/nova,dstroppa/openstack-smartos-nova-grizzly,maoy/zknova,yatinkumbhare/openstack-nova,KarimAllah/nova,yrobla/nova,mgagne/nova,CloudServer/nova,Tehsmash/nova,zaina/nova,sileht/deb-openstack-nova,tealover/nova,Yuriy-Leonov/nova,shail2810/nova,termie/nova-migration-demo,thomasem/nova,Triv90/Nova,alexandrucoman/vbox-nova-driver,klmitch/nova,rrader/nova-docker-plugin,bigswitch/nova,blueboxgroup/nova,sileht/deb-openstack-nova,termie/nova-migration-demo,petrutlucian94/nova_dev,paulmathews/nova,maheshp/novatest,bgxavier/nova,maelnor/nova,fajoy/nova,blueboxgroup/nova,aristanetworks/arista-ovs-nova,TwinkleChawla/nova,DirectXMan12/nova-hacking,russellb/nova,jianghuaw/nova,apporc/nova,yosshy/nova,tianweizhang/nova,savi-dev/nova,redhat-openstack/nova,alexandrucoman/vbox-nova-driver,mikalstill/nova,Stavitsky/nova,BeyondTheClouds/nova,DirectXMan12/nova-hacking,Metaswitch/calico-nova,mikalstill/nova,Yusuke1987/openstack_template,CiscoSystems/nova,edulramirez/nova,Stavitsky/nova,affo/nova,mahak/nova,yrobla/nova,cloudbase/nova-virtualbox,tudorvio/nova,mandeepdhami/nova,CloudServer/nova,usc-isi/extra-specs,berrange/nova,isyippee/nova,sileht/deb-openstack-nova,rajalokan/nova,rajalokan/nova,shahar-stratoscale/nova,zzicewind/nova,CCI-MOC/nova,luogangyi/bcec-nova,rrader/nova-docker-plugin,dims/nova,psiwczak/openstack,NoBodyCam/TftpPxeBootBareMetal,mmnelemane/nova,zhimin711/nova,hanlind/nova,bclau/nova,shahar-stratoscale/nova,KarimAllah/nova,eharney/nova,termie/pupa,paulmathews/nova,varunarya10/nova_test_latest,sridevikoushik31/openstack,fnordahl/nova,CCI-MOC/nova,jeffrey4l/nova,yosshy/nova,ruslanloman/nova,raildo/nova,KarimAllah/nova,eharney/nova,bgxavier/nova,maelnor/nova,JioCloud/nova,spring-week-topos/nova-week,qwefi/nova,eneabio/nova,felixma/nova,plumgrid/plumgrid-nova,usc-isi/extra-specs,vmturbo/nova,cloudbase/nova,eonpatapon/nova,houshengbo/nova_vmware_compute_driver,saleemjaveds/https-github.com-openstack-nova,redhat-openstack/nova,NewpTone/stacklab-nova,belmiromoreira/nova,usc-isi/extra-specs,DirectXMan12/nova-hacking,russellb/nova,citrix-openstack-build/nova,virtualopensystems/nova,akash1808/nova_test_latest,ntt-sic/nova,alaski/nova,ted-gould/nova,ewindisch/nova,citrix-openstack-build/nova,maheshp/novatest,gooddata/openstack-nova,devendermishrajio/nova_test_latest,yrobla/nova,dstroppa/openstack-smartos-nova-grizzly,devendermishrajio/nova,SUSE-Cloud/nova,maoy/zknova,akash1808/nova,felixma/nova,mmnelemane/nova,josephsuh/extra-specs,edulramirez/nova,rajalokan/nova,cloudbau/nova,rahulunair/nova,josephsuh/extra-specs,vmturbo/nova,sacharya/nova,varunarya10/nova_test_latest,adelina-t/nova,vmturbo/nova,tangfeixiong/nova,Francis-Liu/animated-broccoli,nikesh-mahalka/nova,dawnpower/nova,whitepages/nova,shootstar/novatest,devoid/nova,jianghuaw/nova,nikesh-mahalka/nova,cernops/nova,gspilio/nova,gspilio/nova,psiwczak/openstack,ewindisch/nova,usc-isi/nova,TwinkleChawla/nova,leilihh/novaha,Triv90/Nova,apporc/nova,barnsnake351/nova,double12gzh/nova,eayunstack/nova,savi-dev/nova,akash1808/nova,takeshineshiro/nova,gooddata/openstack-nova,NewpTone/stacklab-nova,petrutlucian94/nova_dev,orbitfp7/nova,NewpTone/stacklab-nova,silenceli/nova,qwefi/nova,leilihh/nova,fajoy/nova,devendermishrajio/nova_test_latest,eayunstack/nova,viggates/nova,OpenAcademy-OpenStack/nova-scheduler,CEG-FYP-OpenStack/scheduler,badock/nova,kimjaejoong/nova,cloudbase/nova,OpenAcademy-OpenStack/nova-scheduler,usc-isi/nova,j-carpentier/nova,superstack/nova,cloudbase/nova,openstack/nova,Francis-Liu/animated-broccoli,petrutlucian94/nova,gspilio/nova,devendermishrajio/nova,dims/nova,watonyweng/nova,vladikr/nova_drafts,sridevikoushik31/nova,hanlind/nova