Merged missing changes to file-servers.xml and file-servers.properties from 13521 in V3.1

Synchronized new file-servers-context.xml with these changes
Debugged NFS and Desktop Action Initialization via Spring

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

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

@@ -426,8 +426,6 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
             context.setDisableNodeMonitor(true);
         }
         
-        context.afterPropertiesSet();
-        
         registerContext(context);
         
         // Return the context for this shared filesystem
@@ -444,8 +442,11 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
      * @param ctx the context
      * @exception DeviceContextException
      */
+    @Override
     public void registerContext(DeviceContext ctx) throws DeviceContextException
     {
+        super.registerContext(ctx);
+
         ContentContext context = (ContentContext)ctx;
 
         // Wrap the initialization in a transaction