Consolidate-stats needs update
With the fixes to #2551 (moved) and #2590 (moved), we need to update consolidate-stats. We should get the code for #2551 (moved) and #2590 (moved) running for a while first though, so we can be sure we've built a robust enough consolidate-stats.