xci: Fix XCI_DISTRO vars and remove clean_vm cleanup steps