Merge remote-tracking branch 'origin/4.13' into 4.14

Author: yadvr

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

@@ -158,7 +158,7 @@ def preseed(self):
         self.add_host("::1", "localhost ip6-localhost ip6-loopback")
         self.add_host("ff02::1", "ip6-allnodes")
         self.add_host("ff02::2", "ip6-allrouters")
-        if self.config.is_router():
+        if self.config.is_router() or self.config.is_dhcp():
             self.add_host(self.config.address().get_guest_ip(), "%s data-server" % CsHelper.get_hostname())
 
     def write_hosts(self):