Concurrency fixes for race condition occurring when RequestCollapser is shutdown