Support PHPUnit 3.8+

The directory structure of PHPUnit changes a little bit starting with PHPUnit 3.8. Let's support the old and the new.
Code guideline changes and changelog addition
Reorder changelog entry
Merge pull request #3211 from JoelMarcey/master

Support PHPUnit 3.8+