Merge "Fix csit tests for multicloud"