Merge some KVM patches we are keeping in a topic branch in case there are any merge conflicts that need resolving.
