Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev