Cherry-pick changes to tempest to support exclusion of some tests.
Merge branch 'add-tempest-change'