HIVE-5149
Merge branch 'mthive-0.11-dev' into mthive-0.11
Merge branch 'commontoken' into mthive-0.11
Revert "commontoken"

This reverts commit 0311057a498fbfbefe9f4e47ffef777a978b68ee.
Merge branch 'mthive-0.11-dev' into mthive-0.11
Revert "Revert "commontoken""

This reverts commit bc2bac727730d0c4209d79272de363bab15cb84e.
fix CommonToken Bug
add unlock log
add lock log
delete log
Merge branch 'mthive-0.11-dev' into mthive-0.11