Merge pull request #4310 from stangri/master-luci-app-https-dns-proxy