Merge -r 1162187:1162188 from trunk to branch-0.23 to fix MAPREDUCE-2885.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162189 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -1150,6 +1150,9 @@ Release 0.23.0 - Unreleased
    
     MAPREDUCE-2881. Fix to include log4j 1.2.16 depenency (gkesavan)
 
+    MAPREDUCE-2885. Fix mapred-config.sh to look for hadoop-config.sh in
+    HADOOP_COMMON_HOME/libexec. (acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/bin/mapred-config.sh

@@ -24,6 +24,8 @@ bin=`cd "$bin"; pwd`
 
 if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
   . "$bin/../libexec/hadoop-config.sh"
+elif [ -e "${HADOOP_COMMON_HOME}/libexec/hadoop-config.sh" ]; then
+  . "$HADOOP_COMMON_HOME"/libexec/hadoop-config.sh
 elif [ -e "${HADOOP_COMMON_HOME}/bin/hadoop-config.sh" ]; then
   . "$HADOOP_COMMON_HOME"/bin/hadoop-config.sh
 elif [ -e "${HADOOP_HOME}/bin/hadoop-config.sh" ]; then