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