OSGi/catalog improvements

Makes more sense to move to brooklyn-camp project, nothing rest specific here.