Back-port some refactoring required for an async timeout fix.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1567632 13f79535-47bb-0310-9956-ffa450edef68
In some circumstances asynchronous requests could time out too soon.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1567635 13f79535-47bb-0310-9956-ffa450edef68
Additional fixes required to r1567632. Missed due to naming differences between trunk and 7.0.x

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1567644 13f79535-47bb-0310-9956-ffa450edef68