Merge "Fix compute test_attach_volume"