Signed-off-by: John Zhuge <jzhuge@apache.org> (cherry picked from commit 56e81f2a204d5e65d29222df1b2ba4d892f9c0d5) Conflicts: hadoop-common-project/hadoop-common/src/main/resources/core-default.xml hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java