Merge branch 'devel-2.1'

* devel-2.1:
  ganeti-confd: Call pyinotify flags correctly
  Fix burnin error when trying to grow a file volume
  Some epydoc fixes
  A rewrite of LUClusterVerify
  Introduce a bool CLI option type
  Fix backend.VerifyNode behaviour for VG problems
  Adding missing documentation to make the docs better
  Remove race condition in FileStorage.Create
  KVM: Check instances for actual liveness
  KVM: improve GetInstanceInfo docstring
  Revert "Only override any and all if not defined"
  Adding RAPI call to deactivate-disks for an instance
  Adding RAPI call for activate-disks on an instance
  Add a hint to masterd for inconsistent clusters
  SimpleConfigReader: add docstrings

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