Merge branch 'devel-2.2'

* devel-2.2:
  cli: Use list of options shared between commands
  jqueue: Use separate function for encoding errors
  Fix some epydoc warnings
  Fix breakage introduced by commit 8044bf65
  Remove “dry_run” from opcodes.OpCreateInstance
  Disable the RAPI CA checks in watcher
  move-instance: Fix parameter order in _CreateInstance

Conflicts:
	daemons/ganeti-watcher: Trivial
	lib/cli.py: Trivial

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>