ENG-4787: Fix equals() and hashCode() implementations for CatalogType

and CatalogMap.