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

Conflicts:
	gcov.diff
	server/core/buffer.c
	server/include/buffer.h
	server/modules/routing/readwritesplit/readwritesplit.c

server/core/modutil.c

@@ -79,7 +79,7 @@ unsigned char	*ptr;
 	*length += (*ptr++ << 8);
         ptr += 2;  // Skip sequence id	and COM_QUERY byte
 	*length = *length - 1;
-	*sql = (char *) ptr;
+	*sql = (char *)ptr;
 	return 1;
 }