Avoid to catalog some special roles like Owner (defined in...

Avoid to catalog some special roles like Owner (defined in getSQLCatalog().getSQLCatalogRoleKeysList()).
As __ac_local_roles_group_id_dict__ changed its structure to 'local_group_id': ['Role'] (just the opposite)
adjust test as well.

product/ERP5Catalog/CatalogTool.py

@@ -150,8 +150,9 @@ class IndexableObjectWrapper(object):
               # If not, continue to index it in roles_and_users table.
               if (user, role) not in optimized_role_set:
                 user_role_dict[role] = user # Only add to user_role_dict if not in optimized_role_set (double check)
-            else:
+            elif not (role in role_dict):
               # add here local roles which are not part of optimized ones
+              # and at the same time not a special ones like Owner
               if (user, role) not in optimized_role_set:
                 user_group = '%s:%s' % (prefix, role)
                 if prefix not in allowed_role_set:

product/ERP5Security/tests/testERP5Security.py

@@ -585,8 +585,8 @@ class TestLocalRoleManagement(ERP5TypeTestCase):
     obj = self._makeOne()
     self.assertEqual(['Assignor'], obj.__ac_local_roles__.get('F1_G1_S1'))
     self.assertTrue('Assignor' in user.getRolesInContext(obj))
-    self.assertEqual(('Alternate',),
-      obj.__ac_local_roles_group_id_dict__.get('F1_G1_S1'))
+    self.assertEqual(('F1_G1_S1',),
+      obj.__ac_local_roles_group_id_dict__.get('Alternate'))
     self.abort()