Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

59253: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59199: Reverse Merged as it caused regression MNT-10075
         55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
             55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document


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

source/java/org/alfresco/repo/webdav/WebDAVHelper.java

@@ -1135,14 +1135,4 @@ public class WebDAVHelper
     {
         return LockUtils.isLockedAndReadOnly(nodeRef, m_serviceRegistry.getLockService());
     }
-
-    /**
-     * Indicates if the node is locked and the current user is not lock owner<p>
-     *
-     * @param nodeRef    the node reference
-     */
-    public boolean isLockedAndNotLockOwner(final NodeRef nodeRef)
-    {
-        return LockUtils.isLockedAndNotLockOwner(nodeRef, m_serviceRegistry.getLockService());
-    }
 }

source/java/org/alfresco/repo/webdav/WebDAVMethod.java

@@ -1025,7 +1025,7 @@ public abstract class WebDAVMethod
         NodeRef nodeRef = fileInfo.getNodeRef();
 
         // Regardless of WebDAV locks, if we can't write to this node, then it's locked!
-        if (getDAVHelper().isLockedAndNotLockOwner(nodeRef))
+        if (getDAVHelper().isLockedAndReadOnly(nodeRef))
         {
             throw new WebDAVServerException(WebDAV.WEBDAV_SC_LOCKED);
         }