Merge branch 'master' into VDIScalability

Conflicts:
	exec/xenrt/config.py

diff --cc exec/xenrt/config.py
index 15fd22edc00e5bf18ecd90c6d535b9e0ddaf87a8,287a6d1d86700aa08936f1162c919da598a84fd5..c55e8b211816b839df7b71c362ab7d876b38fbe1
--- 1/exec/xenrt/config.py
--- 2/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@@ -1190,7 -1190,9 +1190,9 @@@ class Config(object)
          self.config["VERSION_CONFIG"]["Dundee"]["TEMPLATE_NAME_SLES_114_64"] = "SUSE Linux Enterprise Server 11 SP3 (64-bit),SUSE Linux Enterprise Server 11 SP3 x64"
          self.config["VERSION_CONFIG"]["Dundee"]["TEMPLATE_NAME_SLED_12_64"] = "SUSE Linux Enterprise Desktop 12 (64-bit)"
          self.config["VERSION_CONFIG"]["Dundee"]["MAX_VBDS_PER_HOST"] = "4096"
 -        self.config["VERSION_CONFIG"]["Dundee"]["MAX_VDIS_PER_VM"] = "255"
 +        self.config["VERSION_CONFIG"]["Dundee"]["MAX_VDIS_PER_VM"] = "254"
+         self.config["VERSION_CONFIG"]["Dundee"]["TEMPLATE_NAME_DEBIAN_80"] = "Debian Jessie 8.0"
+         self.config["VERSION_CONFIG"]["Dundee"]["TEMPLATE_NAME_DEBIAN_80_64"] = "Debian Jessie 8.0"
  
          # XenServer dom0 partitions
          self.config["VERSION_CONFIG"]["Dundee"]["DOM0_PARTITIONS"] = {1:18*xenrt.GIGA, 2:18*xenrt.GIGA, 3:"*", 4:512*xenrt.MEGA, 5:4*xenrt.GIGA, 6:1024*xenrt.MEGA}

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