Merge branch 'develop' into MAX-324

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

server/modules/protocol/mysql_client.c

@@ -576,6 +576,7 @@ int gw_read_client_event(
         CHK_PROTOCOL(protocol);
         rc = dcb_read(dcb, &read_buffer);
         
+	
         if (rc < 0)
         {
                 dcb_close(dcb);