Change in ovirt-engine[master]: engine, userportal, webadmin: Various code fixes