Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev