update config
fix conflicts
Revert "proc: enhance time-average nr_running stats"

This reverts commit a0941f3832f9419f75b769e9558eec3e94eff0b8.