Merge branch 'develop' into MAX-324

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

server/modules/include/mysql_client_server_protocol.h

@@ -61,6 +61,7 @@
 #include <users.h>
 #include <dbusers.h>
 #include <version.h>
+#include <housekeeper.h>
 
 #define GW_MYSQL_VERSION "MaxScale " MAXSCALE_VERSION
 #define GW_MYSQL_LOOP_TIMEOUT 300000000