Merge branch '2.2' into 2.3

maxscale-system-test/maxscales.h

@@ -15,7 +15,7 @@ public:
         READCONN_SLAVE
     };
 
-    Maxscales(const char* pref, const char* test_cwd, bool verbose);
+    Maxscales(const char* pref, const char* test_cwd, bool verbose, bool use_valgrind);
     int read_env();
 
     /**
@@ -319,6 +319,18 @@ public:
      * @param m Number of Maxscale node
      */
     void wait_for_monitor(int intervals = 1, int m = 0);
+
+    /**
+     * @brief use_valrind if true Maxscale will be executed under Valgrind
+     */
+    bool use_valgrind;
+
+    /**
+     * @brief valgring_log_num Counter for Maxscale restarts to avoid Valgrind log overwriting
+     */
+    int valgring_log_num;
+
+
 };
 
 #endif      // MAXSCALES_H