Fixes #1314.

Added `coverage-text` / `showUncoveredFiles` to phpunit.xsd.
Merge branch '4.1' into 4.2
Merge branch '4.2'