Merge "Fix x86 KVM snapshot crash on save, and inability to load snapshots."