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