Fixes for vitess#1

fabianbeule wants to merge 2 commits intoKDSource:add_hooks_t4_ptrac_ssvKDSource/mcpl:add_hooks_t4_ptrac_ssvfrom

fabianbeule:fixes-for-vitessfabianbeule/mcpl-kdsource:fixes-for-vitessCopy head branch name to clipboard