(cherry picked from commit c7c36cbd6218f46c33d7fb2f60cd52cb29e6d720) (cherry picked from commit 4cf7f8441a288cefd44f126d60dae1998239892a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend2.java