svn merge -c 1595978 merging from trunk to branch-2 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam.