[ovirt-devel] code merges in ovirt-engine repo