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