Merge branch 'js/http-https-proxy-fix'

We lost ability to use https:// proxies during this cycle; this is a hotfix for the regression. * js/http-https-proxy-fix: http: accept https:// proxies again