Backport testing fixes to 2.1

Some of the testing fixes weren't included into 2.1 and due to that, a few
of the tests appear to fail.

maxscale-system-test/mariadb_tests_hartmut.sh

@@ -4,7 +4,7 @@
 #
 # TODO: Don't test correctness of routing with mysqltest
 #
-./non_native_setup $1
+
 master_id=`echo "SELECT @@server_id" | mysql -u$node_user -p$node_password -h $node_000_network $ssl_options -P $node_000_port | tail -n1`
 echo "--disable_query_log" > Hartmut_tests/maxscale-mysqltest/testconf.inc
 echo "SET @TMASTER_ID=$master_id;" >> Hartmut_tests/maxscale-mysqltest/testconf.inc

maxscale-system-test/testconnections.cpp

@@ -1672,7 +1672,7 @@ void *timeout_thread( void *ptr )
         Test->timeout--;
     }
     Test->tprintf("\n **** Timeout! *** \n");
-    delete Test;
+    Test->~TestConnections();
     exit(250);
 }