Change in ovirt-engine-sdk-tests[master]: sdk: fix conflicts ann. docs