Bizarre bugfix

I don't understand the bug, but the Twig parser is suddenly rejecting
"endif" tags, picking up an extra space for some reason, but only in some
contexts.  This patch works around the bug for now.

Change-Id: I5751559dc358505876483362a96d725a9f0a9a48
Merge "Bizarre bugfix"