Merge remote-tracking branch 'origin/2.2' into 3.0

# Conflicts:
#	gns3server/version.py

gns3server/compute/base_node.py

@@ -349,8 +349,10 @@ class BaseNode:
         Stop the node process.
         """
 
-        await self.stop_wrap_console()
-        self.status = "stopped"
+        try:
+            await self.stop_wrap_console()
+        finally:
+            self.status = "stopped"
 
     def suspend(self):
         """