Merge "Run cindet-tempest-plugin tests in tempest-extra-tests"