Update/fix by to scp contribution by J Langley as per bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=445729 See comments on gerrit https://git.eclipse.org/r/#/c/34754/ This commit implements changes suggested by slewis in comments in gerrit review. Change-Id: Ic59d7a349b74124038d654d3bc3084537cfe95d8