Change in ovirt-engine[master]: engine: Reduced unneeded query and code clean up