HPCC-11980 Ensure local/child variety of NONEMPTY works.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>

thorlcr/activities/funnel/thfunnelslave.cpp

@@ -715,12 +715,14 @@ public:
     {
         helper = (IHThorNonEmptyArg *) queryHelper();
         sendReceiving = false;
+        masterMpTag = TAG_NULL;
     }
 
 // IThorSlaveActivity overloaded methods
     void init(MemoryBuffer &data, MemoryBuffer &slaveData)
     {
-        masterMpTag = container.queryJob().deserializeMPTag(data);
+        if (!container.queryLocalOrGrouped())
+            masterMpTag = container.queryJob().deserializeMPTag(data);
         appendOutputLinked(this);
     }
     void abort()

thorlcr/graph/thgraph.cpp

@@ -974,6 +974,7 @@ bool isGlobalActivity(CGraphElementBase &container)
         case TAKchildcount:
         case TAKwhen_dataset:
         case TAKwhen_action:
+        case TAKnonempty:
             if (!container.queryLocalOrGrouped())
                 return true;
             break;
@@ -1064,7 +1065,6 @@ bool isGlobalActivity(CGraphElementBase &container)
         case TAKrowresult:
         case TAKremotegraph:
         case TAKlibrarycall:
-        case TAKnonempty:
         default:
             return true; // if in doubt
     }