Merge pull request #1477 from jakesmith/hashagg-localfix

gh-1476 - Fix regression in hashagg,local

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

thorlcr/activities/hashdistrib/thhashdistrib.cpp

@@ -288,7 +288,10 @@ CActivityBase *createHashJoinActivityMaster(CMasterGraphElement *container)
 
 CActivityBase *createHashAggregateActivityMaster(CMasterGraphElement *container)
 {
-    return new HashDistributeActivityMaster(DM_groupaggregate, container);      
+    if (container->queryLocalOrGrouped())
+        return new CMasterActivity(container);
+    else
+        return new HashDistributeActivityMaster(DM_groupaggregate, container);      
 }
 
 CActivityBase *createKeyedDistributeActivityMaster(CMasterGraphElement *container)