merge -r 1201990:1201991 Merging from trunk to branch-0.23 to fix HDFS-2476

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1441463 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3952. In MR2, when Total input paths to process == 1,CombinefileInputFormat.getSplits() returns 0 split. (Bhallamudi Venkata Siva Kamesh via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1441492 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1441494 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9193. hadoop script can inadvertently expand wildcard arguments when delegating to hdfs script. (Andy Isaacson via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1441499 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8214. make hadoop script recognize a full set of deprecated commands(rvs via tgraves)

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