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