Stopping a server doesn't (usually/always) put its MQTT state to "stopped"

Appears to be a race condition during shutdown of a server. The will status of "DISCONNECTED" does get set, but the transition to stopped doesn't get recorded (i.e. in server/state/stopped topic).