Merge "Remove api_version setting from volume v3/v2 service client"