Adress last OSGi merge comments

Yes, see CatalogBundleResourceTest.{testLaunchApplicationWithCatalogReferencingOtherCatalogYaml, testLaunchApplicationWithTypeUsingJavaColonPrefixInYaml, testLaunchApplicationLoopWithJavaTypeNameInYamlFails, testLaunchApplicationLoopCatalogIdInYamlFails}