Merge 3.2 to HEAD:

16691: Merge 3.1 to 3.2
        15827: Fixed bug in delete node event processing
    16695: Merge 3.1 to 3.2
        16163: Added timestamp tracking via file state cache, added support for . and .. pseudo entries in wildcard folder search


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

source/java/org/alfresco/filesys/repo/ContentNetworkFile.java

@@ -224,6 +224,8 @@ public class ContentNetworkFile extends NodeRefNetworkFile
         StringBuilder str = new StringBuilder();
         
         str.append( "[");
+        str.append(getFullName());
+        str.append(",");
         str.append( getNodeRef().getId());
         str.append( ",channel=");
         str.append( channel);