backport necessary changes to work with PHPUnit3.4RC1
refs #1057