Merged V3.2 to HEAD

15171: Merged V3.1 to V3.2
        14215: Fixed ETHREEOH-1314 - WCM - content publisher cannot submit existing folder that has modified properties


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

source/java/org/alfresco/wcm/asset/AssetServiceImplTest.java

@@ -578,7 +578,7 @@ public class AssetServiceImplTest extends AbstractWCMServiceImplTest
             assertEquals("file description", props.get(ContentModel.PROP_DESCRIPTION));
             
             /* TODO - pending ETHREEOH-1314 - fails for content contributor / content publisher during submit if updating folder properties
-            
+            */
             // update folder properties - eg. title and description
             
             newProps = new HashMap<QName, Serializable>(2);
@@ -589,7 +589,8 @@ public class AssetServiceImplTest extends AbstractWCMServiceImplTest
             props = assetService.getAssetProperties(existingFolder1Asset);
             assertEquals("folder title", props.get(ContentModel.PROP_TITLE));
             assertEquals("folder description", props.get(ContentModel.PROP_DESCRIPTION));
-            */
+            
+            
         }
         else
         {