Change-Id: Idf99293085531165239369155c039b55db0eed83 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt