* stable-2.11
  (no changes)

* stable-2.10
  KVM: use running HVPs to calc blockdev options
  KVM: reserve a PCI slot for the SCSI controller
  Check for LVM-based verification results only when enabled
  Fix "existing" typos
  Fix output of gnt-instance info after migration
  Verify configuration version number before parsing

Conflicts:
	lib/config.py: manually apply 2dc0acb9


	    to the version on master

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>