Fix metadata mapping in s3._s3_parse_manifest.
Fix metadata mapping in s3._s3_parse_manifest.

Fixes bug #827617

Fixes incorrect output of the following euca2ools commands:
    'euca-describe-images'
    'euca-describe-instances'
Which occours when user published 'ami' image with 'ari&aki' or 'aki'
image(s).

Fixes minor typo:
    'manifext' -> 'manifest'

Change-Id: If32357e3ea6685476df9dbb6e74af710153457b9

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