ZEN-15365: Catalog self healing
Merge pull request #583 from zenoss/ZEN-15365

ZEN-15365: Catalog self healing