Merged V2.2 to HEAD (V2.1 sourced)

7127: Merged V2.1 to V2.2
      7118: Fixed overly-eager applicability of patches brought forward from previous releases
      7119: Fixed SQL script patch schema numbering
   7245: Merged V2.1 to V2.2:
      7238: Serializes alfresco->alfresco deployments to the same target.
      7241: Added AVM index tracking into the built-in, cron-controlled config.
      7242: More DEBUG messages for index tracking, where required.
      7243: Fix for url encoding issue as found by by Ishii Akinori
   7372: Merged V2.1 to V2.2
      7289: Fix for AWC-1542 where utf-8 characters not displaying correctly in RSS feed output
      7300: Bumped up session size management values to reduce potential issues with mix-style, shorter transactions.
      7303: Portlet updates for MSIE problems in Liferay.
      7304: Added the <cifs-url-suffix>. AWC-1671.
      7317: Fix OO shutdown
      7319: Catch for raising rule executions using null NodeRefs.


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

source/java/org/alfresco/web/bean/NavigationBean.java

@@ -826,9 +826,15 @@ public class NavigationBean
          String serverName = this.cifsServer.getConfiguration().getServerName();
          if (serverName != null && serverName.length() != 0)
          {
-            buf.append("\\\\")
-               .append(serverName)
-               .append("\\");
+            buf.append("\\\\");
+            buf.append(serverName);
+            
+            // Check if there is a suffix to apply to the host name
+            
+            if ( clientConfig != null && clientConfig.getCifsURLSuffix() != null)
+            	buf.append(clientConfig.getCifsURLSuffix());
+            
+            buf.append("\\");
             buf.append(diskShare.getName());
          }