(cherry picked from commit d0fa9b5775185bd83e4a767a7dfc13ef89c5154a) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java Change-Id: I2bba28c56dd08da315856066b58b1778b67bfb45 Co-authored-by: Gautham B A <gautham.bangalore@gmail.com>