LUCENE-5012: get tests passing again

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