Revert "generate an OSGI-compliant jar (bundle)"

This breaks some test targets

This reverts commit c41c1a5e7659f5ff691efd5007b427709e658a5e.
Merge branch '1.0' into 2.0