Fix a regression in connection cleanup.

We don't test that connections actually get closed, and this was
broken by a refactoring that dropped close() on Connection.
Merge pull request #897 from square/jwilson_0605_regression_connection_close

Fix a regression in connection cleanup.