Adress last OSGi merge comments

have these TODO items been addressed?  i don't see the tests, although i do see what looks like some fixes for loading java type when looking in a catalog item with the same id.