(cherry picked from commit cfa8513890ec1cd7f71258ff3c3083f6d89a4fc4) Conflicts: hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh (cherry picked from commit 4db6cc44cd1f1b2692ad3fdc18798cf5f32250ec)
(cherry picked from commit cfa8513890ec1cd7f71258ff3c3083f6d89a4fc4) Conflicts: hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh (cherry picked from commit 4db6cc44cd1f1b2692ad3fdc18798cf5f32250ec)