HDFS-4363. Merge change r1431088 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431101 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4306. PBHelper.convertLocatedBlock miss convert BlockToken. Contributed by Binglin Chang.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431118 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1431131 FIXES: MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery. Contributed by Jerry Chen


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431134 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9155. FsPermission should have different default value, 777 for directory and 666 for file. Contributed by Binglin Chang.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431157 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus calls. (sandyr via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431167 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4032. Specify the charset explicitly rather than rely on the default. Contributed by Eli Collins


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