086577c67a
(cherry picked from commit b18f35f097a3ee33f449e506676961f9b9456bbd) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java