More bug fixes

The main bug fix is fixing the bug fix from earlier that didn't actually fix the bug where exporting xvas didn't work.
Also added `shutdown_command` as an alternative to xapi's clean_shutdown, which doesn't always work.