Merge branch 'V5-4-patches' into V5-5-patches

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