Merge proposals dependent on lp://qastaging/~fboudra/linaro-ci/convert-template-to-lava-test-shell-lp1194435

1. convert-template-to-lava-test-shell-lp1194435
2. Dependent merge proposals