Merge branch '2.3' into 2.4

include/maxscale/monitor.hh

@@ -151,6 +151,10 @@ public:
     static const int BEING_DRAINED_OFF = 3;
     static const int BEING_DRAINED_ON = 4;
 
+    // When a monitor detects that a server is down, these bits should be cleared.
+    static constexpr uint64_t SERVER_DOWN_CLEAR_BITS {SERVER_RUNNING | SERVER_AUTH_ERROR | SERVER_MASTER
+        | SERVER_SLAVE | SERVER_SLAVE_OF_EXT_MASTER | SERVER_RELAY | SERVER_JOINED};
+
     MonitorServer(SERVER* server, const SERVER::DiskSpaceLimits& monitor_limits);
 
     ~MonitorServer();