Always output CodeCoverage if requested (1.8)

Backported from master