eliminate empty paragraphs

There's a small glitch, where the wiki renderer does not respect
Twig tags, so we get extra paragraph marks outside of our conditionals.
For now, we'll strip those out during rendering, if the paragraph was
not included.

Change-Id: I21f0fd9ea27d90816ff7fa864473adfdfb950545
Merge "eliminate empty paragraphs"