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