svn merge -c 1550335 merging from truk to branch-0.23 to fix:HDFS-5637. Try to refeatchToken while local read InvalidToken occurred.