Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4192 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4197 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4205 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4206 .
   svn resolved root\projects\repository\source\java\org\alfresco\filesys\server\config\ServerConfiguration.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4219 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4224 .


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

config/alfresco/workflow/parallelreview_processdefinition.xml

@@ -6,14 +6,7 @@
 
     <start-state name="start">
         <task name="wf:submitParallelReviewTask" swimlane="initiator" />
-        <transition name="" to="startreview">
-            <script>
-                <variable name="wf_approveCount" access="write" />
-                <expression>
-                    wf_approveCount = 0;
-                </expression>
-            </script>
-        </transition>
+        <transition name="" to="startreview"/>
     </start-state>
 
     <node name="startreview">
@@ -21,6 +14,14 @@
             <foreach>#{bpm_assignees}</foreach>
             <var>reviewer</var>
         </action>
+        <event type="node-enter">
+            <script>
+                <variable name="wf_approveCount" access="write" />
+                <expression>
+                    wf_approveCount = 0;
+                </expression>
+            </script>
+        </event>
         <transition name="review" to="review" />
     </node>