Includes a correction to the text in client_side_connection_pool, which
looks like it was caused by a merge conflict.