Merge remote-tracking branch 'origin/candidate-3.10.0' into candidate-3.10.x

Conflicts:
	version.cmake

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

system/mp/mpcomm.cpp

@@ -1024,7 +1024,7 @@ class MultiPacketHandler // TAG_SYS_MULTI
     void logError(unsigned code, MultiPacketHeader &mhdr, CMessageBuffer &msg)
     {
         unsigned ms = msTick();
-        if (lastErrMs-ms > 1000) // avoid logging too much
+        if ((ms-lastErrMs) > 1000) // avoid logging too much
         {
             StringBuffer errorMsg("sender=");
             msg.getSender().getUrlStr(errorMsg).newline();

thorlcr/activities/lookupjoin/thlookupjoinslave.cpp

@@ -88,7 +88,7 @@ class CBroadcaster : public CSimpleInterface
     Owned<IBitSet> slavesStopped;
     IBCastReceive *recvInterface;
     Semaphore allDoneSem;
-    CriticalSection allDoneLock;
+    CriticalSection allDoneLock, bcastOtherCrit;
     bool allDone, allDoneWaiting, allRequestStop, stopping;
     Owned<IBitSet> slavesDone, slavesStopping;
 
@@ -190,6 +190,7 @@ class CBroadcaster : public CSimpleInterface
         unsigned psuedoNode = (myNode<origin) ? slaves-origin+myNode : myNode-origin;
         CMessageBuffer replyMsg;
         // sends to all in 1st pass, then waits for ack from all
+        CriticalBlock b(bcastOtherCrit);
         for (unsigned sendRecv=0; sendRecv<2 && !activity.queryAbortSoon(); sendRecv++)
         {
             unsigned i = 0;