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