Merge branch 'master' into visibleMemory

Conflicts:
	exec/testcases/xenserver/tc/smoketest.py

diff --cc exec/testcases/xenserver/tc/smoketest.py
Simple merge

diff --cc exec/xenrt/interfaces.py
index bd1df9083ade17d400598a63337c487809098d44,f6f199b87967712a15bffce77a40d760fe912a49..28695c2e1c049a61f972b85e5edb57e20694ce02
--- 1/exec/xenrt/interfaces.py
--- 2/exec/xenrt/interfaces.py
+++ b/exec/xenrt/interfaces.py
@@@ -1,6 -1,7 +1,7 @@@
+ import xenrt
  from zope.interface import Interface, Attribute
  
 -__all__=["Toolstack", "OSParent", "OS", "InstallMethodPV", "InstallMethodIso", "InstallMethodIsoWithAnswerFile"]
 +__all__=["Toolstack", "OSParent", "InstallMethodPV", "InstallMethodIso", "InstallMethodIsoWithAnswerFile"]
  
  class Toolstack(Interface):
  

diff --cc exec/xenrt/lib/xenserver/guest.py
Simple merge

diff --cc exec/xenrt/lib/xenserver/host.py
Simple merge

diff --cc exec/xenrt/objects.py
Simple merge