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