On openSUSE, qemu-tools provides qemu-img

Change-Id: I6ab0b7dd871acd6103b15b5fe10350667b72d1a8
Merge "On openSUSE, qemu-tools provides qemu-img"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp