Merge -r 1165948:1165950 from trunk to branch-0.23 to fix MAPREDUCE-2655.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165951 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166005:1166006 from trunk to branch-0.23 to fix MAPREDUCE-2938.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166007 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-2948. Hadoop streaming test failure, post MR-2767 (mahadev) - merging r1166402 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166405 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-7507. Allow ganglia metrics to include the metrics system tags in the gmetric names. Contributed by Alejandro Abdelnur.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166459 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2232. Generalize regular expressions in TestHDFSCLI. Contributed by Plamen Jeliazkov.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166472 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166837:1166838 from trunk to branch-0.23 to fix MAPREDUCE-2908.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166840 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166848:1166849 from trunk to branch-0.23 to fix MAPREDUCE-2947.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166851 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166847:1166848 from trunk to branch. Fixes: HADOOP-7612

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166852 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166854:1166856 from trunk to branch-0.23 to fix MAPREDUCE-2844.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166858 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166900:1166901 from trunk to branch-0.23 to fix MAPREDUCE-2677.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166904 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166912:1166913 from trunk to branch-0.23 to fix HADOOP-7598.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166914 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166954:1166955 from trunk to branch-0.23 to fix MAPREDUCE-2864.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166957 13f79535-47bb-0310-9956-ffa450edef68
fMerge -r 1166957:1166958 from trunk to branch-0.23 to fix MAPREDUCE-2690.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166959 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166965:1166966 from trunk to branch-0.23 to fix MAPREDUCE-2937.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166967 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166967:1166968 from trunk to branch-0.23 to fix MAPREDUCE-2953.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166969 13f79535-47bb-0310-9956-ffa450edef68
Adding back hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources which was missed during merge of MAPREDUCE-279.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166973 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1166974:1166975 from trunk to branch-0.23 to fix MAPREDUCE-2963.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166976 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1167001 from trunk for MAPREDUCE-2711.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167004 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-2954. svn merge -c r1167061 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167063 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1167330:1167331 from trunk to branch-0.23 to fix MAPREDUCE-2975.

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