Merge 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4340 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4350 .
   svn resolved root\projects\3rd-party\.classpath
   svn resolved root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4380 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4420 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 .
   svn resolved root\projects\3rd-party\.classpath


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

config/alfresco/patch/patch-services-context.xml

@@ -469,6 +469,7 @@
         <property name="dependsOn" >
             <list>
                 <ref bean="patch.schemaUpdateScript-V1.4-1" />
+                <ref bean="patch.InvalidNameEnding" />
             </list>
         </property>
     </bean>
@@ -488,5 +489,19 @@
             </list>
         </property>
     </bean>
+    <bean id="patch.InvalidNameEnding" class="org.alfresco.repo.admin.patch.impl.InvalidNameEndingPatch" parent="basePatch" >
+        <property name="id"><value>patch.InvalidNameEnding</value></property>
+        <property name="description"><value>patch.invalidNameEnding.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>21</value></property>
+        <property name="targetSchema"><value>22</value></property>
+        <!-- helper beans -->
+        <property name="sessionFactory">
+            <ref bean="sessionFactory" />
+        </property>
+        <property name="nodeDaoService">
+            <ref bean="nodeDaoService" />
+        </property>
+    </bean>
 
 </beans>