Merge 2.1 into 2.2 branch.

gns3server/ubridge/hypervisor.py

@@ -253,5 +253,5 @@ class Hypervisor(UBridgeHypervisor):
         command = [self._path]
         command.extend(["-H", "{}:{}".format(self._host, self._port)])
         if log.getEffectiveLevel() == logging.DEBUG:
-            command.extend(["-d", "2"])
+            command.extend(["-d", "1"])
         return command

scripts/remote-install.sh

@@ -146,7 +146,7 @@ deb-src http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates main univer
 EOFLIST2
 fi
 
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A2E3EF7B
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys A2E3EF7B
 
 log "Update system packages"
 apt-get update