svn merge -r 1595979:1595984 merging from branch-2 to branch-2.4 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam.