Always output CodeCoverage if requested to (1.6)

Backported from master.