Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/link.py
#	gns3server/controller/snapshot.py
#	gns3server/handlers/api/compute/dynamips_vm_handler.py
#	gns3server/handlers/api/compute/iou_handler.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/schemas/link.py
#	gns3server/utils/path.py
#	gns3server/version.py
#	requirements.txt

tests/controller/test_link.py

@@ -221,6 +221,7 @@ async def test_json(project, compute):
             }
         ],
         "filters": {},
+        "link_style": {},
         "suspend": False,
         "link_type": "ethernet",
         "capturing": False,
@@ -250,6 +251,7 @@ async def test_json(project, compute):
                 }
             }
         ],
+        "link_style": {},
         "filters": {},
         "suspend": False
     }