Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit c1caab40f27e3e4f58ff1b5ef3e93efc56bbecbe) (cherry picked from commit 2cd7577a5a58db42a14a659b85fbd475091d0cb2) (cherry picked from commit 90cc5ddd4957fcb27ef5a1e7ee1a67c4eca9a3f5) (cherry picked from commit 942c5b04f2f7bc33595c4df5c66104ce3c4c2c69) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java