Merge "Fix 'tempest cleanup' for volume service client"