Merge branch 'candidate-7.4.x' into candidate-7.6.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

plugins/h3/h3.cpp

@@ -222,9 +222,9 @@ ECL_H3_API void ECL_H3_CALL polyfill(ICodeContext *_ctx, bool &__isAllResult, si
         if (i == 0)
             west = east = row->lon;
         else if (west > row->lon)
-            west = lon;
+            west = row->lon;
         else if (east < row->lon)
-            east = lon;
+            east = row->lon;
     }
     if (east - west >= 180)
     {

thorlcr/graph/thgraphmaster.cpp

@@ -248,7 +248,7 @@ void CSlaveMessageHandler::threadmain()
                             break;
                         }
                         CActivityBase *activity = element->queryActivity();
-                        if (activity && activity->needReInit())
+                        if (activity)
                             element->sentActInitData->set(slave, 0); // clear to permit serializeActivityInitData to resend
                         toSerialize.append(*LINK(element));
                     }