Cleanup the test output (mixing out and err is confusing), add some info and wait more (somehow NIO2 gets an exception later).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1590377 13f79535-47bb-0310-9956-ffa450edef68
Since I looked at the traces, replace exception wrap with unwrap for IOException.

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