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