(cherry picked from commit 470c87dbc6c24dd3b370f1ad9e7ab1f6dabd2080) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/JspHelper.java