Fix package to produce an OSGi bundle (as per #18) for 2.3.1