HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1.