OSGi/catalog improvements

Agree, some methods are in wrong place, and there are a lot of casts I don't like.  However the catalog subsystem will continue to be dramatically changed as we move to YAML catalog so not spending too much time on this just now.