Unwrap excess <p>s in inline template rendering

This is a hack, in the future Parsoid will have a template re-expansion
API that will produce the correct result.

Change-Id: I328c11330fb3db71c51882717d6b84099c9270d1
Merge "Unwrap excess <p>s in inline template rendering"