Change in ovirt-engine[master]: core: refactored overgrown methods and calls