HDFS-4305. Add a configurable limit on number of blocks per file, and min block size. Contributed by Andrew Wang.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477358 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9194. RPC Support for QoS. (Junping Du via llu)

Merged from trunk@1461370.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477388 13f79535-47bb-0310-9956-ffa450edef68
Fix CRLF in html according to HADOOP-8912.

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