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