Merge "Move 3 volume methods to v2 volumes_client"