Merge "Fix KVM/QEMU plugin bug"