Optional package import for osgi
Merge pull request #1691 from jimmidyson/master

Optional package import for osgi