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