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

* V5-4-patches:
  AIX: Fix a few compiler warnings
  Allow the nodemap to contain multiple nodes for mibs like IF-MIB