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