svn merge -c 1486974 Merging from trunk to branch-2 to fix HDFS-4780.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486975 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1487092:1487093 from trunk onto branch-2. Fixes HDFS-4827.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487099 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1456212 FIXES: HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth


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