Add retry and delays to scp test

Change-Id: I159ac1cfdb9fba62416a3013f7f3057847568566