Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/tests/module_probe.py

Index: client/tests/kvm/tests/module_probe.py
diff --git a/client/tests/kvm/tests/module_probe.py b/client/tests/kvm/tests/module_probe.py
index 72f239b35b37fc63333ca727c6bfd3d36ac0b696..b192b6d99aabc8748acace5e8131c293c7251793 100644
--- a/client/tests/kvm/tests/module_probe.py
+++ b/client/tests/kvm/tests/module_probe.py
@@ -1,6 +1,6 @@
 import re, commands, logging, os
 from autotest_lib.client.common_lib import error, utils
-import kvm_subprocess, kvm_test_utils, kvm_utils, installer
+from autotest_lib.client.virt import kvm_installer
 
 
 def run_module_probe(test, params, env):
@@ -19,7 +19,7 @@ def run_module_probe(test, params, env):
 
     installer_object = env.previous_installer()
     if installer_object is None:
-        installer_object = installer.PreInstalledKvm()
+        installer_object = kvm_installer.PreInstalledKvm()
         installer_object.set_install_params(test, params)
 
     logging.debug('installer object: %r', installer_object)