LUCENE-4657: make test evil again; fix more InterruptedException handling cases

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1428610 13f79535-47bb-0310-9956-ffa450edef68