(cherry picked from commit 680716f31e120f4d3ee70b095e4db46c05b891d9) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageReconstructor.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/PBImageXmlWriter.java (cherry picked from commit 2ce24bf21826fcb81cbb27765807ca9d12bedf6a)