backport nursix' fix for proxy support in edentest
https://github.com/nerdis/edentest/pull/4
Merge pull request #777 from nerdis/master

backport nursix' fix for proxy support in edentest