Another user ran into a similar issue with qubesd and libvirt and they continued from the middle of Stage 3 by manually editing the upgrade script: