- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
- Convert POM to POM macros - Remove OSGi manifest patch; fixed upstream