[ovirt-devel] AAA changes on 3.6 and master