(cherry picked from commit 0a212a40fcbd12a11294bff7a31e7433111733c9) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java
(cherry picked from commit 0a212a40fcbd12a11294bff7a31e7433111733c9) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java