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

* V5-6-patches:
  PATCH #a1283: Recognize Oracle ACFS file system (Thanks John Haxby)