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