clean a few merge errors from network
clean a few merge errors from network

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