CAMP catalog handling: delete unused code
Fix recursive call (catalog type == java type)
Adds catalog.deleteCatalogItem

- needed for CatalogBundleResourceTest, so that tests don’t interfere
  with each other.
squash Fix recursive call
CAMP: handle serviceType “java:” prefix
Merge pull request #1 from aledsage/neykov-copy/osgi

Recursive calls, and other fixes