Don't discard highlighted annotations when merging paragraphs

All text nodes that are children of grouping elements should be counted as ODF content.

Fixes #666.
This checks for something totally different now, right? It just so happens that it works in most cases and for this particular test.