fix mismerge.
fix mismerge.

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