49ff1e5276
(cherry picked from commit db145e0c9add81c74d853baa8187005f97ea1b53) Conflicts: hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh