tests: Rebase/squash jenkins changes

Change-Id: If5612edef0e2dab8574e56751d61b8790cd9e6ce
Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
4 files changed