Addendum: Fix potential FSImage corruption. Contributed by Xiao Chen.

(cherry picked from commit dd70b1f53836961029767660398819a3b04eec58)
(cherry picked from commit c19baf19dac4bca4fd0402105f8a0508c518e65a)

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java

@@ -107,6 +107,8 @@ public class TestHdfsConfigFields extends TestConfigurationFieldsBase {
         .add(DFSConfigKeys.DFS_NAMENODE_STARTUP_KEY);
     configurationPropsToSkipCompare.add(DFSConfigKeys
         .DFS_DATANODE_ENABLE_FILEIO_FAULT_INJECTION_KEY);
+    configurationPropsToSkipCompare.add(DFSConfigKeys
+        .DFS_IMAGE_EXPANDED_STRING_TABLES_KEY);
 
     // Allocate
     xmlPropsToSkipCompare = new HashSet<String>();