Update proxy config if present#1320

dhiltgen wants to merge 1 commit intodocker:masterdocker/cli:masterfrom

dhiltgen:play_nice_with_proxy_masterdhiltgen/cli-1:play_nice_with_proxy_masterCopy head branch name to clipboard