Merge branch 'fix-tempest-flavors' into dt-test