Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py

tests/controller/test_project.py

@@ -75,7 +75,8 @@ def test_json(tmpdir):
         "show_grid": False,
         "show_interface_labels": False,
         "show_layers": False,
-        "snap_to_grid": False
+        "snap_to_grid": False,
+        "grid_size": 0,
     }
 
 

tests/controller/test_topology.py

@@ -45,6 +45,7 @@ def test_project_to_topology_empty(tmpdir):
         "show_interface_labels": False,
         "show_layers": False,
         "snap_to_grid": False,
+        "grid_size": 0,
         "topology": {
             "nodes": [],
             "links": [],