Merge "import new _put_file_shell method from upstream rally"

diff --cc tests/unit/test_ssh.py
index 1e021a0,083ab03..88638a0
--- 1/tests/unit/test_ssh.py
--- 2/tests/unit/test_ssh.py
+++ b/tests/unit/test_ssh.py
@@@ -17,9 -17,8 +17,10 @@@
  # rally/tests/unit/common/test_sshutils.py
  
  import os
+ import socket
  import unittest
 +from cStringIO import StringIO
 +
  import mock
  
  from yardstick import ssh

diff --cc yardstick/ssh.py
Simple merge