Fix recursive call (catalog type == java type)
Adds catalog.deleteCatalogItem

- needed for CatalogBundleResourceTest, so that tests don’t interfere
  with each other.
CAMP: handle serviceType “java:” prefix