Change in ovirt-engine[master]: core: Reduce scope of TagReturnValueIndicator