Merge 1.2.2 into asyncio

Conflicts:
	gns3server/version.py

gns3server/modules/virtualbox/virtualbox_vm.py

@@ -454,6 +454,8 @@ class VirtualBoxVM(object):
         """
 
         log.info("VirtualBox VM {name} [id={id}] has set the VM name to {vmname}".format(name=self._name, id=self._id, vmname=vmname))
+        if self._linked_clone:
+            self._modify_vm('--name "{}"'.format(vmname))
         self._vmname = vmname
 
     @property

gns3server/version.py

@@ -15,5 +15,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+<<<<<<< HEAD
 __version__ = "1.3.dev1"
 __version_info__ = (1, 3, 0, 0)
+=======
+# __version__ is a human-readable version number.
+
+# __version_info__ is a four-tuple for programmatic comparison. The first
+# three numbers are the components of the version number. The fourth
+# is zero for an official release, positive for a development branch,
+# or negative for a release candidate or beta (after the base version
+# number has been incremented)
+
+__version__ = "1.2.2"
+__version_info__ = (1, 2, 2, 0)
+>>>>>>> origin/master