Merge "Added return statement to retype_volume in v2 volumes_client"