Bug#1001782: Integrate KDAB/cleanup branch

[Mathieu Malaterre]

Source: jxrlib
Version: 1.1-6
Tags: patch

Would be nice to integrate the cleanup branch patches from:

* https://github.com/KDAB/jxrlib/commits/cleanup