Always output CodeCoverage if requested

Backported from master