7bbf42b82f
(cherry picked from commit f2c1d9181f80e53890b50309b15c9ea37cb24987) (cherry picked from commit feabfe9cda127a4e0314a20d1f4d745e319d9eaa) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java