diff --git a/NEWS b/NEWS
index 333a89109f657cbf208aee6f3a6999670e0b00b6..eed6c0ba4af828333ef3e4144bebd8ad4c24f17a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
 News
 ====
 
+Version 2.2.0 rc2
+-----------------
+
+*(Released Wed, 22 Sep 2010)*
+
+- Fixed OS_VARIANT variable for OS scripts
+- Fixed cluster tag operations via RAPI
+- Made ``setup-ssh`` exit with non-zero code if an error occurred
+- Disabled RAPI CA checks in watcher
+
+
 Version 2.2.0 rc1
 -----------------
 
diff --git a/configure.ac b/configure.ac
index d0f3a82c748b4a7b9837ff8c49099cf2d42e95db..2e3b588e55b8b1a01a2b133a3d171b63054b9f27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [2])
 m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc1])
+m4_define([gnt_version_suffix], [~rc2])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index c849dba54d819b4eb7724fa4d2824e112c4612e2..184dd8fb03ee642b09eaeedfd75d27fdc4949527 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -923,10 +923,6 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     if not alive:
       raise errors.HypervisorError("Instance not running, cannot migrate")
 
-    if not netutils.TcpPing(target, port, live_port_needed=True):
-      raise errors.HypervisorError("Remote host %s not listening on port"
-                                   " %s, cannot migrate" % (target, port))
-
     if not live:
       self._CallMonitorCommand(instance_name, 'stop')
 
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 6d9e0f9cb16b3c26e29234d95cea60b3d681bf97..601587591fcc8bb1e028b43cb149fca911436b34 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1534,8 +1534,6 @@ commands = {
 
 #: dictionary with aliases for commands
 aliases = {
-  'activate_block_devs': 'activate-disks',
-  'replace_disks': 'replace-disks',
   'start': 'startup',
   'stop': 'shutdown',
   }