This is splitting out the okhttp portion from #1648, since we are wanting to get it done before Keep-Alive in general is completed.
