Merge branch '2.3' into 2.4

BUILD/install_test_build_deps.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Installs all build dependecies for maxscale-system-test
+# Installs all build dependencies for system tests
 # Only Ubuntu Bionic/Xenial, CentOS 7, SLES 15 are supported
 
 rp=`realpath $0`

CMakeLists.txt

@@ -198,7 +198,7 @@ if(BUILD_TESTS)
 endif()
 
 if(BUILD_SYSTEM_TESTS)
-  add_subdirectory(maxscale-system-test)
+  add_subdirectory(system-test)
 endif()
 
 # Generate text versions of some documents

maxscale-system-test

@@ -0,0 +1 @@
+system-test/

script/maxscale-set-change-date

@@ -15,7 +15,7 @@
 SCRIPT="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 MAXSCALE_ROOT=${SCRIPT}/..
 
-DIRS="avro client connectors Documentation etc examples include maxctrl maxscale-system-test maxutils query_classifier script rabbitmq_consumer server"
+DIRS="avro client connectors Documentation etc examples include maxctrl system-test maxutils query_classifier script rabbitmq_consumer server"
 
 function check_dirs
 {