Merge branch 'develop' into MAX-324

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

macros.cmake

@@ -47,10 +47,10 @@ macro(set_variables)
 
   # password of MaxScale user
   set(TEST_PASSWORD "maxpwd" CACHE STRING "password of MaxScale user")
-  
+
   # Use static version of libmysqld
   set(STATIC_EMBEDDED TRUE CACHE BOOL "Use static version of libmysqld")
-  
+
   # Build RabbitMQ components
   set(BUILD_RABBITMQ FALSE CACHE BOOL "Build RabbitMQ components")