Merge branch 'master' into develop

server/core/gateway.c

@@ -56,6 +56,7 @@
 #include <config.h>
 #include <poll.h>
 #include <housekeeper.h>
+#include <service.h>
 #include <memlog.h>
 
 #include <stdlib.h>
@@ -576,7 +577,7 @@ return_succp:
 static bool resolve_maxscale_homedir(
         char** p_home_dir)
 {
-        bool  succp;
+        bool  succp = false;
         char* tmp;
 	char* tmp2;
         char* log_context = NULL;
@@ -1841,7 +1842,8 @@ return_main:
 void
 shutdown_server()
 {
-        poll_shutdown();
+	service_shutdown();
+	poll_shutdown();
 	hkshutdown();
 	memlog_flush_all();
         log_flush_shutdown();