Merge "Fix test_volume_swap_with_multiattach"