svn merge -c 1342512 from trunk for HDFS-3368. Missing blocks due to bad DataNodes coming up and down.