HDFS-2856: correct DFSClient merge.