[ticket/11323] Backport include_define test to olympus.

PHPBB3-11323
Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympus

* p/ticket/11323-olympus:
  [ticket/11323] Backport include_define test to olympus.
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11323] Backport include_define test to olympus.

Conflicts:
	tests/template/template_test.php