Fix ssh key test
Merge pull request #485 from liggitt/fix_ssh_key_test

Merged by openshift-bot
Respect proxy config when deploying from binary file url
Fixes Bug 1019646 and Bug 1020473
Merge pull request #487 from fabianofranz/master

Merged by openshift-bot