Present correct ec2id format for volumes and snaps
Present correct ec2id format for volumes and snaps

Fixes bug 1013765
* Add template argument to ec2utils.id_to_ec2_id() calls

Change-Id: I5e574f8e60d091ef8862ad814e2c8ab993daa366

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