svn merge -c 1487643 from trunk for HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree.