Merge pull request #579 from ncw/fix-volume-selection

Fix selection of v2 volumes in openstack blockstorage