Change in ovirt-engine[master]: core: refactor: renamed variables + extracted creating map