Merge "Use create_volume wrapper instead of volumes_client"