svn merge -c 1579670 from trunk for HDFS-6129. When a replica is not found for deletion, do not throw an exception.