LUCENE-5858: try to get nightly-smoke passing

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