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