Merge "Portal AAF REST API perm fixes for Roles"