fixes bug 928051 wip
Merge pull request #1899 from rhelmer/bug928051-reports_clean-b2g

(NEEDS REBASE) fix bug 928051 - get b2g into reports_clean