Merge "Fix test_volume_upload BadRequest error"