Change in ovirt-engine[master]: core: cleanup: inline local fields