Making OSGi imports optional.
Merge pull request #429 from mkw/master

Making OSGi imports optional.