Improvements in OSGi manifest generation. Fixes #297.
Merge pull request #298 from splatch/master

Improvements in OSGi manifest generation. Fixes #297.