Merge "Fix race in test_attach_detach_volume"