HDFS-4518. Finer grained metrics for HDFS capacity. Contributed by Arpit Agarwal.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1451385 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9349. Confusing output when running hadoop version from one hadoop installation when HADOOP_HOME points to another. (sandyr via tucu)

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