snapshot_disk: Perform xml save/restore

For some reason this test failed in a long run, subsequent tests failed
because improper cleanup left a snapshot in the xml, but not in the file
system resulting in the next test(s) failing to find the file.
Merge pull request #59 from jferlan/snapshot_disk

snapshot_disk: Perform xml save/restore