[fix #643] fix retry with resolvedlocks info#645

yegetables wants to merge 2 commits intotikv:mastertikv/client-java:masterfrom

yegetables:fix-retry-lockyegetables/client-java:fix-retry-lockCopy head branch name to clipboard