Change in ovirt-engine[master]: engine : Refactoring in accordance with vdsm patches