Merge "Fix volume transfer tests with tenant isolation disabled"