HADOOP-9604. Javadoc of FSDataOutputStream is slightly inaccurate. Contributed by Jingguo Yao.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491669 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4878. On Remove Block, block is not removed from neededReplications queue. Contributed by Tao Luo.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491672 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-258-branch-2-gd