improved osgi manifest generation