Change in ovirt-engine[master]: webadmin, userportal: Code improvements