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