backported some ext/intl tests from 5.6 into 5.4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
	ext/intl/tests/collator_get_sort_key_variant2.phpt
	ext/intl/tests/locale_get_display_name3.phpt
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backported some ext/intl tests from 5.6 into 5.4