Using display.html

I am implementing a fix to ensure that Merge Template commands such as <?endif?> will always appear on a line of their own, when generating the sample display template. See this item in the Pipeline.