XWIKI-10819: Unable to complete step 2 of DW
Merge pull request #318 from msmeria/master

XWIKI-10819: Unable to complete step 2 of DW
* Fix the way template macro parameter values are quoted
* Leave an empty line between two consecutive template macro calls to prevent generating an empty paragraph