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