INT-3280 Fix SFTP Class Tangle

JIRA: https://jira.springsource.org/browse/INT-3280
Merge branch 'INT-3280'