Merge branch 'devel-2.2'

* devel-2.2:
  RAPI client: Support modifying instances
  RAPI: Allow modifying instance
  Small fixes for instance creation via RAPI documentation
  gnt-debug: Extend job queue tests
  jqueue: Mark opcodes following failed ones as failed, too
  jqueue: Work around race condition between job processing and archival
  jqueue: More checks for cancelling queued job
  errors: Function to check whether value is encoded error
  jqueue: Add more debug output
  gnt-backup: Pass error code to OpPrereqError
  Fix --master-netdev arg name in gnt-cluster(8)
  Restore 'tablet mouse on vnc' behavior
  Document the usb_mouse hv parameter
  Revert "Add -usbdevice tablet to KVM when using vnc"

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --cc lib/cmdlib.py
Simple merge

diff --cc lib/errors.py
Simple merge

diff --cc lib/hypervisor/hv_kvm.py
index 30b715c,c849dba..4091761
--- 1/lib/hypervisor/hv_kvm.py
--- 2/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@@ -570,10 -571,11 +572,11 @@@ class KVMHypervisor(hv_base.BaseHypervi
      if mouse_type:
        kvm_cmd.extend(['-usb'])
        kvm_cmd.extend(['-usbdevice', mouse_type])
+     elif vnc_bind_address:
+       kvm_cmd.extend(['-usbdevice', constants.HT_MOUSE_TABLET])
  
-     vnc_bind_address = hvp[constants.HV_VNC_BIND_ADDRESS]
      if vnc_bind_address:
 -      if netutils.IsValidIP4(vnc_bind_address):
 +      if netutils.IP4Address.IsValid(vnc_bind_address):
          if instance.network_port > constants.VNC_BASE_PORT:
            display = instance.network_port - constants.VNC_BASE_PORT
            if vnc_bind_address == constants.IP4_ADDRESS_ANY:

diff --cc lib/jqueue.py
Simple merge

diff --cc lib/rapi/client.py
Simple merge