Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/compute.py
#	gns3server/schemas/gns3vm.py
#	gns3server/utils/application_id.py
#	gns3server/version.py
#	gns3server/web/web_server.py

gns3server/controller/compute.py

@@ -64,8 +64,8 @@ class Compute:
     A GNS3 compute.
     """
 
-    def __init__(self, compute_id, controller=None, protocol="http", host="localhost", port=3080, user=None,
-                 password=None, name=None, console_host=None):
+    def __init__(self, compute_id, controller=None, protocol="http", host="localhost",
+                 port=3080, user=None, password=None, name=None, console_host=None, ssl_context=None):
         self._http_session = None
         assert controller is not None
         log.info("Create compute %s", compute_id)
@@ -90,6 +90,7 @@ class Compute:
         self._memory_usage_percent = 0
         self._disk_usage_percent = 0
         self._last_error = None
+        self._ssl_context = ssl_context
         self._capabilities = {
             "version": "",
             "platform": "",
@@ -105,7 +106,7 @@ class Compute:
 
     def _session(self):
         if self._http_session is None or self._http_session.closed is True:
-            connector = aiohttp.TCPConnector(force_close=True)
+            connector = aiohttp.TCPConnector(force_close=True, ssl_context=self._ssl_context)
             self._http_session = aiohttp.ClientSession(connector=connector)
         return self._http_session