Merge pull request #4731 from stangri/18.06-luci-app-https-dns-proxy