fix bridge name
fix bridge name

Conflicts:

	nova/endpoint/cloud.py

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