Fix JAXB binding and OSGi bundle generation