Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2

Conflicts:
	client/Makefile
	server/core/buffer.c
	server/core/test/makefile
	server/include/buffer.h
	server/modules/filter/Makefile
	server/modules/routing/webserver.c

server/core/server.c

@@ -416,6 +416,8 @@ char	*status = NULL;
 		strcat(status, "Slave, ");
 	if (server->status & SERVER_JOINED)
 		strcat(status, "Synced, ");
+	if (server->status & SERVER_NDB)
+		strcat(status, "NDB, ");
 	if (server->status & SERVER_RUNNING)
 		strcat(status, "Running");
 	else