(cherry picked from commit 48ca23def1d1c28448a65238814070e79c8f4c4e) (cherry picked from commit d21bc811d82f685b0a1338bc513d9a925d305a17) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java