fix mismerge
fix mismerge

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