Fix test - because of big #67397 we don't allow overlong locales anymore
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test - because of big #67397 we don't allow overlong locales anymore
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix test - because of big #67397 we don't allow overlong locales anymore
remove bug67072_2 test for 5.6+ since we'd have cleaner solution
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove bug67072_2 test for 5.6+ since we'd have cleaner solution
  Fix test - because of big #67397 we don't allow overlong locales anymore