Merge branch 'develop' into MXS-121

Conflicts:
	server/modules/monitor/mysql_mon.c

server/include/test_utils.h

@@ -8,11 +8,13 @@
 
 void init_test_env(char *path)
 {
-    int argc = 3;
+    int argc = 5;
     
     char* argv[] =
         {
             "log_manager",
+            "-l",
+            "LOGFILE_ERROR",
             "-j",
             path? path:TEST_LOG_DIR,
             NULL