Fix phpunit to be compatible with new version of phpunit
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
Merge remote-tracking branch 'origin/3.5' into develop

Conflicts:
	test/phpunit/DateLibTzFranceTest.php
	test/phpunit/ModulesTest.php
Fix: Run script from correct dir
Sync from transifex