Merge branch 'develop' into schemarouter_refresh

Documentation/Getting-Started/Building-MaxScale-from-Source-Code.md

@@ -28,7 +28,7 @@ You will need to install all of the following packages for all versions of RHEL,
 
 ```
 gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool 
-openssl-devel libaio libaio-devel librabbitmq-devel
+openssl-devel libaio libaio-devel librabbitmq-devel libcurl-devel pcre-devel
 ```
 
 In addition, if you wish to to build an RPM package include:
@@ -68,7 +68,7 @@ These packages are required on all versions of Ubuntu and Debian.
 
 ```
 	build-essential libssl-dev libaio-dev ncurses-dev bison
-	cmake perl libtool librabbitmq-dev     
+	cmake perl libtool librabbitmq-dev libcurl-dev libpcre3-dev
 ```
 
 If you want to build a DEB package, you will also need:

server/modules/include/schemarouter.h

@@ -316,7 +316,6 @@ typedef struct router_instance {
         struct router_instance* next;        /*< Next router on the list            */
 	bool			available_slaves; /*< The router has some slaves available */
 
-
 } ROUTER_INSTANCE;
 
 #define BACKEND_TYPE(b) (SERVER_IS_MASTER((b)->backend_server) ? BE_MASTER :    \