Merge branch 'pr-upstream-http-proxy' into 'develop'

Pr upstream http proxy

See merge request !43
2 jobs for develop in 2 minutes and 18 seconds (queued for 44 seconds)