Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py

gns3server/web/web_server.py

@@ -36,8 +36,7 @@ from ..compute import MODULES
 from ..compute.port_manager import PortManager
 from ..compute.qemu import Qemu
 from ..controller import Controller
-
-from gns3server.utils.asyncio import asyncio_ensure_future
+from ..utils.asyncio import asyncio_ensure_future
 
 # do not delete this import
 import gns3server.handlers
@@ -139,7 +138,10 @@ class WebServer:
 
         def signal_handler(signame, *args):
             log.warning("Server has got signal {}, exiting...".format(signame))
-            asyncio_ensure_future(self.shutdown_server())
+            try:
+                asyncio_ensure_future(self.shutdown_server())
+            except asyncio.CancelledError:
+                pass
 
         signals = ["SIGTERM", "SIGINT"]
         if sys.platform.startswith("win"):
@@ -304,4 +306,7 @@ class WebServer:
             log.warning("TypeError exception in the loop {}".format(e))
         finally:
             if self._loop.is_running():
-                self._loop.run_until_complete(self.shutdown_server())
+                try:
+                    self._loop.run_until_complete(self.shutdown_server())
+                except asyncio.CancelledError:
+                    pass