rebase and review comments addressed
rebase and review comments addressed

Signed-off-by: Michael Henriksen <b9ef7c0267c64e2f371c827c1252a60e7416e767@redhat.com>

kubevirt/kubevirt,kubevirt/kubevirt,kubevirt/kubevirt,kubevirt/kubevirt