Integration

Updates to the latest Asciidoclet version.

This PR may need a bit of an invasive merge as it includes a rebase.