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.
Merge pull request #667 from peitschie/odf-empty-fixup

Don't discard highlighted annotations when merging paragraphs