Merge branch '2.1' into develop

Bringing in MXS-1406

query_classifier/test/maxscale.test

@@ -83,4 +83,7 @@ SELECT her FROM (SELECT @@server_id as her) as t WHERE her REGEXP '.*';
 select * from db1.t1 union select * from db2.t2;
 
 # Names is a keyword as well
-select names from t;
+select names from t;
+
+call p1();
+call p1(@var);