Merge "Avoiding exception if guest refuses to detach a volume" into stable/fraser