Fix mismerge
Fix mismerge

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