
Just merging CHANGES.txt changes from branch-2 to keep in sync. (cherry picked from commit a87ab77fec375c02ba507bd7c7ca1e0082f623c2) Conflicts: hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
Just merging CHANGES.txt changes from branch-2 to keep in sync. (cherry picked from commit a87ab77fec375c02ba507bd7c7ca1e0082f623c2) Conflicts: hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh