Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

Conflicts:
	log_manager/log_manager.cc

log_manager/log_manager.cc

@@ -1446,8 +1446,10 @@ int skygw_log_rotate(
 	logfile_id_t  id)
 {
 	int err = 0;
-	
 	va_list valist; /**< Dummy, must be present but it is not processed */
+
+	
+
 	
 	if (!logmanager_register(false)) {
 		ss_dfprintf(stderr,
@@ -1464,7 +1466,9 @@ int skygw_log_rotate(
 	
 return_unregister:
 	logmanager_unregister();
-return_err:
+
+	return_err:
+
 	return err;
 }