Change in ovirt-engine[master]: userportal: refactor - reorganize code