Merge branch '2.1'

# Conflicts:
#	gns3server/compute/dynamips/nodes/atm_switch.py

gns3server/compute/dynamips/nodes/atm_switch.py

@@ -81,7 +81,7 @@ class ATMSwitch(Device):
         :param new_name: New name for this switch
         """
 
-        await self._hypervisor.send('atm rename "{name}" "{new_name}"'.format(name=self._name, new_name=new_name))
+        await self._hypervisor.send('atmsw rename "{name}" "{new_name}"'.format(name=self._name, new_name=new_name))
         log.info('ATM switch "{name}" [{id}]: renamed to "{new_name}"'.format(name=self._name,
                                                                               id=self._id,
                                                                               new_name=new_name))

gns3server/controller/node.py

@@ -100,7 +100,7 @@ class Node:
                     try:
                         setattr(self, prop, kwargs[prop])
                     except AttributeError as e:
-                        log.critical("Cannot set attribute '%s'".format(prop))
+                        log.critical("Cannot set attribute '{}'".format(prop))
                         raise e
                 else:
                     if prop not in self.CONTROLLER_ONLY_PROPERTIES and kwargs[prop] is not None and kwargs[prop] != "":