Remove cf_report.cf from masterfiles
Merge remote-tracking branch 'upstream/master' into bug2193