HDFS-6904. Added files missing in previous commit.