ZEN-15365: Catalog self healing