Merge remote-tracking branch 'origin/4.11' into 4.12

Author: yadvr

systemvm/debian/opt/cloud/bin/cs/CsDhcp.py

@@ -139,7 +139,8 @@ def delete_leases(self):
             logging.error("Caught error while trying to delete entries from dnsmasq.leases file: %s" % e)
 
     def preseed(self):
-        self.add_host("127.0.0.1", "localhost %s" % CsHelper.get_hostname())
+        self.add_host("127.0.0.1", "localhost")
+        self.add_host("127.0.1.1", "%s" % CsHelper.get_hostname())
         self.add_host("::1", "localhost ip6-localhost ip6-loopback")
         self.add_host("ff02::1", "ip6-allnodes")
         self.add_host("ff02::2", "ip6-allrouters")

utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java

@@ -30,9 +30,11 @@ public static String generatePostUploadUrl(String ssvmUrlDomain, String ipAddres
 
         //if ssvm url domain is present, use it to construct hostname in the format 1-2-3-4.domain
         // if the domain name is not present, ssl validation fails and has to be ignored
-        if(StringUtils.isNotBlank(ssvmUrlDomain)) {
+        if(StringUtils.isNotBlank(ssvmUrlDomain) && ssvmUrlDomain.startsWith("*")) {
             hostname = ipAddress.replace(".", "-");
             hostname = hostname + ssvmUrlDomain.substring(1);
+        } else if (StringUtils.isNotBlank(ssvmUrlDomain)) {
+            hostname = ssvmUrlDomain;
         }
 
         //only https works with postupload and url format is fixed