Merge "Re-enable detach volume from unrescued VM"