HDFS-4778. Fixes some issues that the first patch on HDFS-2576 missed. Contributed by Devaraj Das.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477849 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2576. Moved the commit message lines for HDFS-4778 and HDFS-2576 in CHANGES.txt to the right places.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477855 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-HDFS-4310-trunk-gd