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