Merge from upstream master: Pass $upstreamServers to template

includes/dhcp.php

@@ -52,6 +52,7 @@ function DisplayDHCPConfig()
     exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return);
     $conf = array_merge(ParseConfig($return));
     $hosts = (array)$conf['dhcp-host'];
+    $upstreamServers = (array)$conf['server'];
     exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
     exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
 
@@ -63,6 +64,7 @@ function DisplayDHCPConfig()
             "ap_iface",
             "conf",
             "hosts",
+            "upstreamServers",
             "interfaces",
             "leases"
         )