WIP server: resolve tsan failure due to main_common refactor#2616

jmarantz wants to merge 4 commits intoenvoyproxy:masterenvoyproxy/envoy:masterfrom

jmarantz:main-common-tsan-failurejmarantz/envoy:main-common-tsan-failureCopy head branch name to clipboard