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