ec2/cloud.py: fix mismerge
ec2/cloud.py: fix mismerge

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