Contributed by Wei-Chiu Chuang. Change-Id: I7abeaf4b65e2a4758356aa69ab8930f7e993077d (cherry picked from commit 096533c2dc0afd51367030725d797480a22ba7e2) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/resources/log4j.properties (cherry picked from commit 1d55e1e229d835a6743523b9cf4c1e97b4259128)