Fix handling of large journal entries.

Evan Hunt requested to merge 339-issues-with-large-journal-entries-v9_11-v9_9 into v9_9

Merge request reports