HDFS-2832. Merge r1550363 from trunk for merging HDFS Heterogeneous Storage feature phase 1.

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