SOLR-4554: There are some test fails because of a wait loop that causes lingering threads.

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