Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  HP UX, CPU statistics: Fix an invalid pointer dereference