Merge branch 'feature/fix-integration_CMIX-630' into 'master'

Feature/fix integration cmix 630

See merge request privategrity/integration!16

basice2e/clients.goldoutput/client12.out

 Sending Message to 2, Jim: Hello, 2
-Message from 31, #General Received: Channel, Hello
+Message from 4, Rick Received: Hello, 1
 Sending Message to 2, Jim: Hello, 2
 Message from 4, Rick Received: Hello, 1

basice2e/clients.goldoutput/client23.out

 Sending Message to 3, Ben: Hello, 3
-Message from 31, #General Received: Channel, Hello
+Message from 1, David Received: Hello, 2
 Sending Message to 3, Ben: Hello, 3
 Message from 1, David Received: Hello, 2

basice2e/clients.goldoutput/client34.out

 Sending Message to 4, Rick: Hello, 4
-Message from 31, #General Received: Channel, Hello
+Message from 2, Jim Received: Hello, 3
 Sending Message to 4, Rick: Hello, 4
 Message from 2, Jim Received: Hello, 3

basice2e/clients.goldoutput/client41.out

 Sending Message to 1, David: Hello, 1
-Message from 31, #General Received: Channel, Hello
+Message from 3, Ben Received: Hello, 4
 Sending Message to 1, David: Hello, 1
 Message from 3, Ben Received: Hello, 4

basice2e/run.sh

@@ -124,6 +124,13 @@ do
     wait $PIDVAL
 done
 
+# Send a channel message that all clients will receive
+CLIENTCMD="timeout 240s ../bin/client -f blob5 --numnodes 5 -g $GATEWAY -i 5 -d 31 -m \"Channel, Hello\" --noratchet"
+eval $CLIENTCMD >> $CLIENTOUT/client5.out 2>&1 &
+PIDVAL=$!
+echo "$CLIENTCMD -- $PIDVAL"
+wait $PIDVAL
+
 sleep 10 # Spend some time waiting for the channel bot to send messages
 
 echo "RUNNING CLIENTS..."