Merge branch '2.2' into develop

maxscale-system-test/keepalived_masterdown.cpp

@@ -39,6 +39,7 @@ int main(int argc, char* argv[])
     bool passive;
     char str[1024];
 
+    TestConnections::multiple_maxscales(true);
     TestConnections* Test = new TestConnections(argc, argv);
     // Test->set_timeout(10);