Fix broken test caused by fdb2709.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
	ext/intl/tests/dateformat_format.phpt
Further test fixes for the fdb2709 breakage.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
Merge branch 'master' of git://github.com/php/php-src