Merged V2.0 to HEAD

5146: AR-1122
   5148: AR-1116
   5149: RM-5
   5152: AR-1167
   5153: WCM-324
   5154: WCM-325, WCM-301, WCM-258, WCM-25, WCM-320
   5156: WCM-338
   5158: AR-1164
   5169: AR-1216
   5177: WCM-328


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

source/java/org/alfresco/repo/webservice/content/ContentWebService.java

@@ -144,6 +144,12 @@ public class ContentWebService extends AbstractWebService implements
             // Get the file name
             String filename = (String)this.nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
             
+            // Filename may not exist if this node isn't a cm:object 
+            if (filename == null) 
+            { 
+              filename = "file.bin"; 
+            }
+            
             // format the URL that can be used to download the content
             String downloadUrl = MessageFormat.format(BROWSER_URL,
                     new Object[] { req.getScheme(), address,