applying manual patch of HDFS-5804