Fix timeout support in vtclient2
Merge branch 'liguo'