Instead of putting versioned endpoints in the catalog, drop the versioned endpoints in sample_data.sh in favor of unversioned ones (for identity, at least).
Instead of putting versioned endpoints in the catalog, drop the versioned endpoints in sample_data.sh in favor of unversioned ones (for identity, at least).