(cherry picked from commit 84e2c11f969825e52b6bdb4696f48e4567875d41) 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