fixes bug 895235 - merge crashstats and socorro codebases