Merge remote-tracking branch 'origin/candidate-4.0.0' into candidate-4.0.2

Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>

roxie/ccd/ccdfile.cpp

@@ -1051,7 +1051,7 @@ public:
         offset_t dfsSize = partProps.getPropInt64("@size", -1);
         bool local = partProps.getPropBool("@local");
         unsigned crc;
-        if (!pdesc->getCrc(crc))
+        if (!crcResources || !pdesc->getCrc(crc))
             crc = 0;
         CDateTime dfsDate;
         if (checkFileDate)