HDFS-3851. Merging change r1609858 from trunk to branch-2.

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

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -32,6 +32,8 @@ Release 2.6.0 - UNRELEASED
     HDFS-2976. Remove unnecessary method (tokenRefetchNeeded) in DFSClient.
     (Uma Maheswara Rao G)
 
+    HDFS-3851. DFSOutputStream class code cleanup. (Jing Zhao via suresh)
+
   OPTIMIZATIONS
 
   BUG FIXES