Fix author name on the #63228 patch.
Fixed tests (they might fail from time to time because of session GC)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.