Merge branch 'develop' into MAX-324

Conflicts:
	macros.cmake
	server/core/config.c
	server/core/service.c
	server/modules/routing/CMakeLists.txt

server/modules/routing/readwritesplit/readwritesplit.c

@@ -3756,7 +3756,7 @@ static GWBUF* sescmd_cursor_process_replies(
 			     dcb_close(bref->bref_dcb);
 			     *reconnect = true;
 			     if(replybuf)
-				 gwbuf_free(replybuf);
+				 gwbuf_consume(replybuf,gwbuf_length(replybuf));
 			}
                 }
                 /** This is a response from the master and it is the "right" one.