(cherry picked from commit 6f63566694f8cec64a469448a8fa00ce921ce367) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java
(cherry picked from commit 6f63566694f8cec64a469448a8fa00ce921ce367) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java