Merge branch '1.5' into 2.0

tests/compute/docker/test_docker_vm.py

@@ -684,7 +684,7 @@ def test_add_ubridge_connection_no_free_interface(loop, vm):
     nio = vm.manager.create_nio(0, nio)
     with pytest.raises(DockerError):
 
-        # We create fake ethernet interfaces for docker
+        # We create fake ethernet interfaces for docker
         interfaces = ["veth-gns3-ext{}".format(index) for index in range(128)]
 
         with patch("psutil.net_if_addrs", return_value=interfaces):

tests/compute/iou/test_iou_vm.py

@@ -216,7 +216,7 @@ def test_path(vm, fake_iou_bin):
 def test_path_12_location(vm, fake_iou_bin):
 
     # In 1.2 users uploaded images to the images roots
-    # after the migration their images are inside images/IOU
+    # after the migration their images are inside images/IOU
     # but old topologies use old path
     with patch("gns3server.config.Config.get_section_config", return_value={"local": True}):
         vm.path = fake_iou_bin.replace("/IOU", "")