Merge "Fix cleanup for EC2 test_compute_with_volumes"