Merge branch '2.2' into 3.0

# Conflicts:
#	CHANGELOG
#	gns3server/compute/iou/iou_vm.py
#	gns3server/crash_report.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	requirements.txt
#	setup.py

gns3server/controller/import_project.py

@@ -336,7 +336,7 @@ async def update_snapshots(snapshots_dir, project_path, project_name, project_id
                     topology = json.load(f)
                     topology["name"] = project_name
                     topology["project_id"] = project_id
-                    regenerate_topology_ids(topology, project_path, reset_mac_addresses)
+                    regenerate_topology_ids(topology, tmpdir, reset_mac_addresses)
                 with open(topology_file_path, "w+", encoding="utf-8") as f:
                     json.dump(topology, f, indent=4, sort_keys=True)
             except OSError as e:

gns3server/controller/snapshot.py

@@ -140,7 +140,7 @@ class Snapshot:
             # delete the current project files
             project_files_path = os.path.join(self._project.path, "project-files")
             if os.path.exists(project_files_path):
-                await wait_run_in_executor(shutil.rmtree, project_files_path)
+                await wait_run_in_executor(shutil.rmtree, project_files_path, ignore_errors=True)
             with open(self._path, "rb") as f:
                 project = await import_project(
                     self._project.controller,