Change in ovirt-engine[master]: aaa: fixing more context issues