MAPREDUCE-5352. Optimize node local splits generated by CombineFileInputFormat. (sseth)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1509345 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9806 PortmapInterface should check if the procedure is out-of-range. Contributed by Brandon Li

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1509347 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch upstream/$:{upbranch}