Contributed by Sivaguru Sankaridurg (cherry picked from commit 021974f4cb1eb8cf530dabc95039fed46e66a43d) Conflicts: hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Contributed by Sivaguru Sankaridurg (cherry picked from commit 021974f4cb1eb8cf530dabc95039fed46e66a43d) Conflicts: hadoop-common-project/hadoop-common/src/main/resources/core-default.xml