Persist only CPU-type rows for hrProcessor / hrDevice collection
Merge remote-tracking branch 'origin/1.12'