LUCENE-5376: get tests passing

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