Merged V34 to HEAD:

Merged V33 to V34:
     24440: ALF-6114: Rules for updated items are triggered before users commit any changes.



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

source/java/org/alfresco/repo/jscript/ScriptUtils.java

@@ -199,4 +199,20 @@ public final class ScriptUtils extends BaseScopableProcessorExtension
     {
         return I18NUtil.getMessage(messageId, params);
     }
+    
+    /**
+     * Disable rule execution for this thread
+     */
+    public void disableRules()
+    {
+        services.getRuleService().disableRules();
+    }
+    
+    /**
+     * Enable rule execution for this thread
+     */
+    public void enableRules()
+    {
+        services.getRuleService().enableRules();
+    }
 }