Fix bug with wrong baseline calculation in last paragraph (2nd attempt)

This time, we consider the cases where a \par is not wanted (single-par insets, tabular cells).

Fixes: #9231
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.09.01-08.00