[libvirt PATCH] Make systemd unit ordering more robust