What does this MR do and why?
venus: backport of reviewed patches from !24130 (merged) and !24103 (merged)
This backport contains only clean cherry-picks and is to prepare for fixes building atop them, otherwise the merge conflict for upcoming fixes around venus query pool support is unmanageable. In addition, this entire backport sits within venus code base.
Test: build venus and run cts and apps
/cc @dbaker