Fix ec2 CreateVolumes/DescribeVolumes status

In admin context CreateVolumes/DescribeVolumes returns
extraneous information such as project_id, host, instance
data etc. This results in output which is not compatible
with the ec2 API. This change removes the addition
of the extra information.

This only partially fixes bug #1074901 as mapping the internal
volume states to ones specified by the ec2 api results in the devstack
euca.sh exercises to fail. But that can't be fixed until the fix
in this patch is through as the extraneous information returned by DescribeVolumes
causes euca-describe-volumes to not to show the attachment state for
a volume which is needed by the euca exercises.

Change-Id: I48a96fbfe4bb2e3da9514d688638ecdf3a168303
ec2 CreateVolumes/DescribeVolumes status mapping

'attaching' and 'detaching' are not valid ec2 API volume status
values. Instead map them both to 'in-use'.

Note this will not pass the devstack exercises until
https://review.openstack.org/#/c/27244/ goes through

Fixes bug #1074901

Change-Id: Id3dfd525d24d622aab5e350e42713fdb7671b31e
Merge "Fix ec2 CreateVolumes/DescribeVolumes status"
Merge "ec2 CreateVolumes/DescribeVolumes status mapping"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp