* stable-2.11
  Improve speed of Xen hypervisor unit tests
  Improve Xen instance state handling

* stable-2.10
  Make QA fail if KVM hotplugging fails
  Always preserve QA command output
  Don't lose stdout/stderr in AssertCommand
  qa_utils: Allow passing fail=None to AssertCommand
  qa_utils: Make AssertCommand return stdout/stderr as well
  Allow plain/DRBD conversions regardless of lack of disks
  Add support for ipolicy modifications to mock config

Conflicts:
	lib/cmdlib/instance.py
	qa/qa_instance.py
	test/py/cmdlib/testsupport/config_mock.py
Resolution:
	instance.py: Keep new testing logic, modify snode fetch.
	qa_instance.py: Reenable hotplug tests.
        config_mock.py: Combine all changes.

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>