Fix osgi packaging
Merge pull request #879 from mposolda/master

Fix osgi packaging