Solve qemu-kvm/qemu-kvm-rhev conflict

Change-Id: Iabd32f6b025b01a5b71f6a2e8669b67fce7e47f3
Merge "Solve qemu-kvm/qemu-kvm-rhev conflict"