[ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.

PHPBB3-11860
Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympus

* github-bantu/ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
[ticket/10521] Allow language switching by URL parameter

PHPBB3-10521
[ticket/12382] Allow nested loops in included files.

They have to reference the fully qualified loop name in BEGIN and END.

PHPBB3-12382
Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus

* github-vse/ticket/10521:
  [ticket/10521] Allow language switching by URL parameter
[ticket/12382] Event loop nesting inclusion applies to regular includes too

PHPBB3-12382
Merge pull request #2391 from naderman/ticket/12382

[ticket/12382] Allow nested loops in included files.
Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympus

* github-bantu/ticket/11860:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
[ticket/12429] Can not insert into more columns than exist.

PHPBB3-12429
Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into develop-ascraeus

* github-bantu/ticket/12429-ascraeus:
  [ticket/12429] Can not insert into more columns than exist.
[ticket/10521] Update docblock of set_cookie for new HttpOnly param

PHPBB3-10521
Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus

* github-vse/ticket/10521:
  [ticket/10521] Update docblock of set_cookie for new HttpOnly param
[ticket/10521] Fix broken tests using set_cookie

PHPBB3-10521
Merge remote-tracking branch 'VSEphpbb/ticket/10521' into develop-ascraeus

* VSEphpbb/ticket/10521:
  [ticket/10521] Fix broken tests using set_cookie
[ticket/12485] Broken tests due to absolute exclude

PHPBB3-12485
Merge pull request #2396 from Nicofuma/ticket/12485

[ticket/12485] Broken tests due to absolute 'exclude'

* Nicofuma/ticket/12485:
  [ticket/12485] Broken tests due to absolute exclude
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12485] Broken tests due to absolute exclude

Conflicts:
	.travis.yml
	phpunit.xml.all
	phpunit.xml.dist
	phpunit.xml.functional
[ticket/12470] Move phing sniff into new .sh

PHPBB3-12470
[ticket/12470] Move setup of database to new .sh

PHPBB3-12470