- Harmonize with the NIO1 connector for upgrade close.
- Actually understand where the (cosmetic) async close traces were coming from.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1576548 13f79535-47bb-0310-9956-ffa450edef68
Revert timeout change (no effect).

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