Merge "Fix test_attach_detach_volume test case to not rely on user/libvirt supplied disk name"