[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

PHPBB3-11718
[ticket/11718] Quick test for fixes in ELSEIF

PHPBB3-11718
Merge remote-tracking branch 'EXreaction/ticket/11718' into develop

* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
Merge remote-tracking branch 'phpbb-core/develop'

* phpbb-core/develop:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF