Merge "Always use an available plugin for CLI sahara test"