* devel-2.4:
  Use floppy disk and a second CDROM on KVM
  Document the selection of instance kernels
  Make root_path an optional hypervisor parameter
  Some man page updates
  Add 2 new variables to the OS scripts environment
  Add --no-wait-for-sync when converting to drbd
  Recreate instance disks: allow changing nodes
  Rename instance: only show new name when different
  Fix race condition in LUGroupAssignNodes
  Re-wrap and fix formatting issues in gnt-instance.rst
  Documentation for the new parameters for KVM
  cmdlib: Fix typo, s/nick/NIC/
  A small optimisation in cluster verify
  A few docstring fixes
  luxi: do not handle KeyboardInterrupt
  Handle EPIPE errors while writing to the terminal
  Cluster verify: check for missing bridges

Conflicts:
	lib/cmdlib.py
          - manually merge the 2.4 fix
	lib/opcodes.py
          - add new field from 2.4, but also describe it
	man/gnt-cluster.rst
	man/gnt-instance.rst
	man/gnt-node.rst
          - merge new attributes with general 2.4 manpage fixes

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