fix to work on different ICU versions
fix the test according to how new date code does it
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix the test according to how new date code does it
  fix to work on different ICU versions