9d11d2a8f2
(cherry picked from commit 095ac834022df6136b42961c507ec745c6cf8f97) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java