Merge "BUG-4794: use the transaction invoker for hwvtep"