Merge pull request #5647 in master
Support PHPUnit 3.8+ compatibility

PHPUnit 3.8+ adds a method to its PHPUnit_Framework_TestListener interface called addRiskyTest(). Need to stub it out to avoid "must implement this interface method" fatals when using 3.8+.
Remove trailing spaces.
Merge pull request #5781
Merge pull request #5781 in develop