am 47b8f5d5: Merge "Test that timeouts are respected on recycled connections." into klp-dev

* commit '47b8f5d55e5184facc5cea4d3e93db86bd96931b':
  Test that timeouts are respected on recycled connections.