Merge branch 'master' into DMC_changes2

diff --cc exec/xenrt/config.py
index c20fc85307f0f6c4434e050d1f25349892571a94,1e641d774f1bb82b62d84be3c939c9b64eec0faf..9a7e7e8df982a5a4c9b7b3276faae8dbd4f898db
--- 1/exec/xenrt/config.py
--- 2/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@@ -2101,19 -2098,25 +2101,25 @@@ class Config(object)
          self.config["GUEST_LIMITATIONS"]["win8-x64"]["MAX_VM_VCPUS"] = "16"
          self.config["GUEST_LIMITATIONS"]["win10-x86"] = {}
          self.config["GUEST_LIMITATIONS"]["win10-x86"]["MINMEMORY"] = "1024"
 -        self.config["GUEST_LIMITATIONS"]["win10-x86"]["MAXMEMORY"] = "131072"
 +        self.config["GUEST_LIMITATIONS"]["win10-x86"]["MAXMEMORY"] = "4096"
          self.config["GUEST_LIMITATIONS"]["win10-x86"]["MAXSOCKETS"] = "2"
          self.config["GUEST_LIMITATIONS"]["win10-x86"]["MAX_VM_VCPUS"] = "16"
+         self.config["GUEST_LIMITATIONS"]["win10-x86"]["MIN_ROOTDISK"] = "32768" 
+         self.config["GUEST_LIMITATIONS"]["win10-x86"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
          self.config["GUEST_LIMITATIONS"]["win10-x64"] = {}
          self.config["GUEST_LIMITATIONS"]["win10-x64"]["MINMEMORY"] = "2048"
          self.config["GUEST_LIMITATIONS"]["win10-x64"]["MAXMEMORY"] = "131072"
          self.config["GUEST_LIMITATIONS"]["win10-x64"]["MAXSOCKETS"] = "2"
          self.config["GUEST_LIMITATIONS"]["win10-x64"]["MAX_VM_VCPUS"] = "16"
+         self.config["GUEST_LIMITATIONS"]["win10-x64"]["MIN_ROOTDISK"] = "32768" 
+         self.config["GUEST_LIMITATIONS"]["win10-x64"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
          self.config["GUEST_LIMITATIONS"]["win81-x86"] = {}
          self.config["GUEST_LIMITATIONS"]["win81-x86"]["MINMEMORY"] = "1024"
 -        self.config["GUEST_LIMITATIONS"]["win81-x86"]["MAXMEMORY"] = "131072"
 +        self.config["GUEST_LIMITATIONS"]["win81-x86"]["MAXMEMORY"] = "4096"
          self.config["GUEST_LIMITATIONS"]["win81-x86"]["MAXSOCKETS"] = "2"
          self.config["GUEST_LIMITATIONS"]["win81-x86"]["MAX_VM_VCPUS"] = "16"
+         self.config["GUEST_LIMITATIONS"]["win81-x86"]["MIN_ROOTDISK"] = "32768" 
+         self.config["GUEST_LIMITATIONS"]["win81-x86"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
          self.config["GUEST_LIMITATIONS"]["win81-x64"] = {}
          self.config["GUEST_LIMITATIONS"]["win81-x64"]["MINMEMORY"] = "2048"
          self.config["GUEST_LIMITATIONS"]["win81-x64"]["MAXMEMORY"] = "131072"
@@@ -2135,9 -2139,10 +2143,11 @@@
          self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MAXMEMORY"] = "524288"
          self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MAXSOCKETS"] = "64"
          self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MAX_VM_VCPUS"] = "16"
+         self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MIN_ROOTDISK"] = "32768" 
+         self.config["GUEST_LIMITATIONS"]["ws12r2-x64"]["MIN_ROOTDISK_MEMORY_DIFF"] = "20480"
          self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"] = {}
          self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"]["MINMEMORY"] = "2048"
 +        self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"]["STATICMINMEMORY"] = "1024"
          self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"]["MAXMEMORY"] = "524288"
          self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"]["MAXSOCKETS"] = "64"
          self.config["GUEST_LIMITATIONS"]["ws12r2core-x64"]["MAX_VM_VCPUS"] = "16"

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