Merge branch '2.3' into 2.4

maxscale-system-test/maxtest/src/testconnections.cpp

@@ -577,13 +577,14 @@ TestConnections::~TestConnections()
         // galera->disable_ssl();
     }
 
+    // stop all Maxscales to detect crashes on exit
+    for (int i = 0; i < maxscales->N; i++)
+    {
+        stop_maxscale(i);
+    }
+
     if (maxscales->use_valgrind)
     {
-        // stop all Maxscales to get proper Valgrind logs
-        for (int i = 0; i < maxscales->N; i++)
-        {
-            stop_maxscale(i);
-        }
         sleep(15);      // sleep to let logs be written do disks
     }
 

maxscale-system-test/rwsplit_readonly_stress.cpp

@@ -102,6 +102,7 @@ int main(int argc, char* argv[])
     }
 
     Test->tprintf("Waiting for all threads to finish\n");
+    Test->set_timeout(60);
     running = 0;
 
     for (int i = 0; i < THREADS; i++)