Merge branch '2.3' into 2.4

system-test/teef_no_master.cpp

@@ -0,0 +1,17 @@
+/**
+ * @file bug664.cpp Tee filter branch session failure test
+ *
+ * - Configure MaxScale so that the branched session will always fail
+ * - Execute query on the main service and check that MaxScale is alive
+ * - An error should be logged about the failed branch session
+ */
+
+#include <maxtest/testconnections.hh>
+
+int main(int argc, char* argv[])
+{
+    TestConnections test(argc, argv);
+    test.check_maxscale_alive(0);
+    test.log_includes(0, "Failed to create new router session for service 'RW_Split'");
+    return test.global_result;
+}