removed duplicate function definitions
removed duplicate function definitions

fixes bug 1091611

Change-Id: I8d4d69122e5743dc230ce83d3631b6edfed6ebbd

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