Merged V2.0 to HEAD

5136: AR-918
   5137, 5138: AWC-1083
   5139: WCM-309, WCM-311


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5325 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/domain/hibernate/DbAccessControlListImpl.java

@@ -171,6 +171,9 @@ public class DbAccessControlListImpl extends LifecycleAdapter
             // remove from the entry list
             entry.delete();
         }
+        // Fix issues with deleting and adding permissions
+        // See AR-918
+        this.getSession().flush();
         // done
         if (logger.isDebugEnabled())
         {