Reviewed-by: chegar, dholmes

Reviewed-by: darcy, weijun

Summary: Fix all known flaky tests, plus minor maintenance
Reviewed-by: martin, chegar