Fix up code-coverage generation problems.
Merge branch 'master' of https://github.com/joomla/joomla-framework