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