Fix #64572: Clean up after the test

Lets not leave stuff lying around.
Fix #64572: Clean up after the test

Lets not leave stuff lying around.
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'