Always output CodeCoverage if requested to (1.7)

Backported from master