Merge remote-tracking branch 'origin/candidate-7.10.x' into candidate-7.12.x

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

# Conflicts:
#	version.cmake

roxie/ccd/ccdserver.cpp

@@ -7799,7 +7799,8 @@ class CRoxieServerHashDedupActivity : public CRoxieServerActivity
         virtual ~HashDedupTable()
         {
             //elementRowAllocator is a unique allocator, so all rows can be freed in a single call
-            elementRowAllocator->releaseAllRows();
+            if (elementRowAllocator)
+                elementRowAllocator->releaseAllRows();
             tablecount = 0;
         }