Follow up to r1643002. If something goes wrong, ensure non-container threads are unblocked.

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