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.