[libvirt PATCH v2] Make systemd unit ordering more robust