LUCENE-5449: backport the _TestHelper changes. if this one 
breaks the build I'm switching to agriculture.


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