[fix] Try to resolve non-unique bundle names
[refactoring] Use new OsgifyModelBuilder to generate update site bundles