Merge branch '1.5' into 2.0

Conflicts:
	gns3server/handlers/api/compute/iou_handler.py

gns3server/compute/iou/iou_vm.py

@@ -1060,6 +1060,14 @@ class IOUVM(BaseNode):
                 else:
                     startup_config = startup_config.replace("%h", self._name)
                     f.write(startup_config)
+
+            vlan_file = os.path.join(self.working_dir, "vlan.dat-{:05d}".format(self.application_id))
+            if os.path.exists(vlan_file):
+                try:
+                    os.remove(vlan_file)
+                except OSError as e:
+                    log.error("Could not delete VLAN file '{}': {}".format(vlan_file, e))
+
         except OSError as e:
             raise IOUError("Can't write startup-config file '{}': {}".format(startup_config_path, e))