Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/compute/iou/iou_vm.py

gns3server/compute/iou/iou_vm.py

@@ -436,9 +436,9 @@ class IOUVM(BaseNode):
                 )
             )
 
-    def _is_iou_licence_check_enabled(self):
+    def _is_iou_license_check_enabled(self):
         """
-        Returns if IOU licence check is enabled.
+        Returns if IOU license check is enabled.
 
         :return: boolean
         """
@@ -459,7 +459,7 @@ class IOUVM(BaseNode):
 
         return True
 
-    async def _check_iou_licence(self):
+    async def _check_iou_license(self):
         """
         Checks for a valid IOU key in the iourc file (paranoid mode).
         """
@@ -569,14 +569,13 @@ class IOUVM(BaseNode):
                 raise IOUError(f"Could not rename nvram files: {e}")
 
             iourc_path = None
-            if self._is_iou_licence_check_enabled():
+            if self._is_iou_license_check_enabled():
                 iourc_path = self.iourc_path
                 if not iourc_path:
                     raise IOUError("Could not find an iourc file (IOU license), please configure an IOU license")
                 if not os.path.isfile(iourc_path):
                     raise IOUError(f"The iourc path '{iourc_path}' is not a regular file")
-
-                await self._check_iou_licence()
+                await self._check_iou_license()
 
             await self._start_ubridge()
             self._create_netmap_config()