Merge KVM related commits we are keeping in a topic branch in case of any conflicts with generic KVM changes.