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

systemvm/debian/etc/vpcdnsmasq.conf

@@ -462,3 +462,4 @@ log-facility=/var/log/dnsmasq.log
 conf-dir=/etc/dnsmasq.d
 
 dhcp-optsfile=/etc/dhcpopts.txt
+localise-queries

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

@@ -127,6 +127,9 @@ class CsDhcp(CsDataBag):
                 listen_address.append(gateway)
             else:
                 listen_address.append(ip)
+            # Add localized "data-server" records in /etc/hosts for VPC routers
+            if self.config.is_vpc():
+                self.add_host(gateway, "%s data-server" % CsHelper.get_hostname())
             idx += 1
 
         # Listen Address