Merge "Add Sahara client for scenarios tests"