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

84382: Merged DEV (5.0.0.BF) to HEAD-BUG-FIX (5.0/Cloud)
      83951: ACE-968 : CIFS: folder is not deleted if it has subfolder and document inside
      The folder is now not deleted if it has pseudo files inside.
      The info about deleted pseudo files is not returned to the client.


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

source/java/org/alfresco/filesys/alfresco/PseudoFileOverlayImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Alfresco Software Limited.
+ * Copyright (C) 2007-2014 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -261,7 +261,10 @@ public class PseudoFileOverlayImpl implements PseudoFileOverlay
         {
             return null;
         }
-        
+        if (isDeleted(parentDir, fname))
+        {
+            return null;
+        }
         if(context.isAlfrescoURLEnabled())
         {
             if(context.getURLFileName().equals(fname))