Improve osgi manifest generation