Merge branch '2.1' into 2.2

server/modules/routing/binlogrouter/blr_slave.c

@@ -7837,6 +7837,15 @@ static bool blr_handle_admin_stmt(ROUTER_INSTANCE *router,
                         return true;
                     }
 
+                    /* Mark as active the master server struct */
+                    spinlock_acquire(&router->lock);
+                    if (!router->service->dbref->server->is_active)
+                    {
+                        router->service->dbref->server->is_active = true;
+                        router->service->dbref->active = true;
+                    }
+                    spinlock_release(&router->lock);
+
                     /**
                      * check if router is BLRM_UNCONFIGURED
                      * and change state to BLRM_SLAVE_STOPPED