Change in ovirt-engine[master]: core: findbugs + improving code