svn merge -c 1440259 from branch-1 for HDFS-4423. Checkpoint exception may cause fatal damage to fsimage.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1440260 13f79535-47bb-0310-9956-ffa450edef68