HADOOP-10040. Merging change r1531491 from trunk to branch-2.

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531502 13f79535-47bb-0310-9956-ffa450edef68
Fix typo (HDFS-5276 -> HDFS-5267) in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531503 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-226-branch-2-gd