Fix phpunit to be compatible with new version of phpunit
Merge remote-tracking branch 'origin/3.5' into 3.5_backported