Export just the volume metadata for the database to be populated

Change I8c01ba3 retrieved the metadata from Cinder, however it did
not format the output correctly resulting in the metadata being lost
between Cinder and Nova.

This patch fixes Bug 1175571 correctly, ensuring that metadata is
transferred from Glance images to Cinder Volumes and on to Nova
instances.

Change-Id: Ie3a688e6bff539e09ec705ed901534f5829cf167
Merge "Export just the volume metadata for the database to be populated"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp