More fixes to get scp plugin working

Change-Id: I1780569ae476e6985efac9e5b7af42edf74e6989
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>