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

* V5-4-patches:
  BUG #2521: AIX: dont die when CPU is dynamically added to system.