LUCENE-5205: Tim's test cleanup patch

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