Clean up leftover file after the test
Remove broken client version checking
Fixed bug #65047 (Test skip on client / server version)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test